From d91f903f591d727d576ad863565ddb7de7d2ae53 Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Mon, 14 Sep 2026 17:47:50 +0100 Subject: [PATCH] only keep latest cores from fusesoc-cores --- cores/fusesoc-cores.nix | 148 ++++------------------------------------ flake.nix | 3 +- 2 files changed, 13 insertions(+), 138 deletions(-) diff --git a/cores/fusesoc-cores.nix b/cores/fusesoc-cores.nix index 4837261..11bbc5b 100644 --- a/cores/fusesoc-cores.nix +++ b/cores/fusesoc-cores.nix @@ -154,103 +154,14 @@ map (x: fusesocLib.importCore (x // { coreRoot = "${fusesoc-cores}/${x.coreRoot} (get "bsg-external-hardfloat.core" "sha256-YN9kzBvnqzDUt12BOK9uus1dTjKd0LXpanyEsbenrMM=") ])) ++ (coresIn "i2c" (get: [ - (get "i2c-1.14-r1.core" "sha256-JVUO5Znh/bqkdbzMRjCcTUrh/HtXf08ArcsQgsQ5X9M=") (get "i2c-1.15.core" "sha256-/zD0g4o2NNZhd6HrgXqvdXhU9Y90cyP+VAsIXQJnQRU=") ])) ++ (coresIn "jtag_vpi" (get: [ - (get "jtag_vpi-r3.core" "sha256-atWzMSY+F02Jx3YfHfcCOru/QZZbS+2HQLhD6UCJ/Kw=") - (get "jtag_vpi-r4.core" "sha256-atWzMSY+F02Jx3YfHfcCOru/QZZbS+2HQLhD6UCJ/Kw=") (get "jtag_vpi-r5.core" "sha256-cdvzLGsA+C7z/mqN16ZmQDYedB+t81k8SO5vpVV8Cx8=") ])) ++ (coresIn "mor1kx" (get: [ - (get "mor1kx-5.0-r2.core" "sha256-i14TGNXeTVfnnNwZQ514arRV95ncpfD5CDE77Mp0Pt4=") - (get "mor1kx-5.1.core" "sha256-mjWQ/KFxQbxjhI6MDgg8W/aRRobUWncafeaz21Slg10=") (get "mor1kx-5.2.core" "sha256-2PMnwymtnCDYuMmlgOEbupqFf2utVYVpeOGz/nWH3ZE=") ])) - ++ (coresIn "open-logic/3.1.0" (get: [ - (get "olo_axi.core" "sha256-DaW8AyCm0uFYkJarajC+XKhkHqiW1h6hN/84y7scYGM=") - (get "olo_base.core" "sha256-DaW8AyCm0uFYkJarajC+XKhkHqiW1h6hN/84y7scYGM=") - (get "olo_intf.core" "sha256-DaW8AyCm0uFYkJarajC+XKhkHqiW1h6hN/84y7scYGM=") - (get "olo_quartus_tutorial.core" "sha256-DaW8AyCm0uFYkJarajC+XKhkHqiW1h6hN/84y7scYGM=") - (get "olo_vivado_tutorial.core" "sha256-DaW8AyCm0uFYkJarajC+XKhkHqiW1h6hN/84y7scYGM=") - ])) - ++ (coresIn "open-logic/3.2.0" (get: [ - (get "olo_axi.core" "sha256-3enhuVik79tA+J4VvdneICl4/QEU+QcYKqRLEoFU3r0=") - (get "olo_base.core" "sha256-3enhuVik79tA+J4VvdneICl4/QEU+QcYKqRLEoFU3r0=") - (get "olo_intf.core" "sha256-3enhuVik79tA+J4VvdneICl4/QEU+QcYKqRLEoFU3r0=") - (get "olo_quartus_tutorial.core" "sha256-3enhuVik79tA+J4VvdneICl4/QEU+QcYKqRLEoFU3r0=") - (get "olo_vivado_tutorial.core" "sha256-3enhuVik79tA+J4VvdneICl4/QEU+QcYKqRLEoFU3r0=") - ])) - ++ (coresIn "open-logic/3.3.0" (get: [ - (get "en_cl_fix.core" "sha256-GEMghZ0DAH7AgUh6v+Y5O9iVsa1Y87qqg27HVEEHNhs=") - (get "olo_axi.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - (get "olo_base.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - (get "olo_fix.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - (get "olo_fix_tutorial.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - (get "olo_intf.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - (get "olo_quartus_tutorial.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - (get "olo_vivado_tutorial.core" "sha256-hiGJpjfkT8f1OA3DoCstesI2q0UayiAdNK9pkvhkYHo=") - ])) - ++ (coresIn "open-logic/4.0.0" (get: [ - (get "en_cl_fix.core" "sha256-6VfOKvbP+m3bpF/MLw9yzuP3CwyF5OkbdzGY4vcwPZU=") - (get "olo_axi.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - (get "olo_base.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - (get "olo_fix.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - (get "olo_fix_tutorial.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - (get "olo_intf.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - (get "olo_quartus_tutorial.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - (get "olo_vivado_tutorial.core" "sha256-/M0kI/bEtXOQso7xP5Q2lsdRRQph+y2eHz6o3mL3GfI=") - ])) - ++ (coresIn "open-logic/4.1.0" (get: [ - (get "en_cl_fix.core" "sha256-DoPvgMcYrRM5CKZUyA7iU3lA6/3OjpxqCmzCauEKnIg=") - (get "olo_axi.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - (get "olo_base.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - (get "olo_fix.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - (get "olo_fix_tutorial.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - (get "olo_intf.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - (get "olo_quartus_tutorial.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - (get "olo_vivado_tutorial.core" "sha256-h0tb0NxH8qs8bOdVewZdGxm0BNzTGNR+ho7i4ljheLQ=") - ])) - ++ (coresIn "open-logic/4.2.0" (get: [ - (get "en_cl_fix.core" "sha256-/LKm+fiJW0As+yd+/coJVs5+tOPb0eEKi01y+q9j4Ik=") - (get "olo_axi.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - (get "olo_base.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - (get "olo_fix.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - (get "olo_fix_tutorial.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - (get "olo_intf.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - (get "olo_quartus_tutorial.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - (get "olo_vivado_tutorial.core" "sha256-VeM140CZVbPCCDinGsH5oO8AP/VLxjRitZmP4sO1bo0=") - ])) - ++ (coresIn "open-logic/4.3.0" (get: [ - (get "en_cl_fix.core" "sha256-/LKm+fiJW0As+yd+/coJVs5+tOPb0eEKi01y+q9j4Ik=") - (get "olo_axi.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - (get "olo_base.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - (get "olo_fix.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - (get "olo_fix_tutorial.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - (get "olo_intf.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - (get "olo_quartus_tutorial.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - (get "olo_vivado_tutorial.core" "sha256-+qy0Y2qSNa1mbTaGv+dDpGtnUaV/UQoYBoV3YqVD/JI=") - ])) - ++ (coresIn "open-logic/4.4.0" (get: [ - (get "en_cl_fix.core" "sha256-/LKm+fiJW0As+yd+/coJVs5+tOPb0eEKi01y+q9j4Ik=") - (get "olo_axi.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - (get "olo_base.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - (get "olo_fix.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - (get "olo_fix_tutorial.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - (get "olo_intf.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - (get "olo_quartus_tutorial.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - (get "olo_vivado_tutorial.core" "sha256-xMB0iJUPi/4cuOyppNJTwSHV+RGhNGjg8tWwSZ8YNvs=") - ])) - ++ (coresIn "open-logic/4.4.1" (get: [ - (get "en_cl_fix.core" "sha256-/LKm+fiJW0As+yd+/coJVs5+tOPb0eEKi01y+q9j4Ik=") - (get "olo_axi.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - (get "olo_base.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - (get "olo_fix.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - (get "olo_fix_tutorial.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - (get "olo_intf.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - (get "olo_quartus_tutorial.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - (get "olo_vivado_tutorial.core" "sha256-oYXhhqGIZEBm8W11mNmKSJE/hIlXFNBIUgxH0MF4n4Y=") - ])) ++ (coresIn "open-logic/4.5.0" (get: [ (get "en_cl_fix.core" "sha256-/LKm+fiJW0As+yd+/coJVs5+tOPb0eEKi01y+q9j4Ik=") (get "olo_axi.core" "sha256-U4Rd9Om9GeneignJgxr+DMxQclWMzg0NseSVapWtY3k=") @@ -267,25 +178,22 @@ map (x: fusesocLib.importCore (x // { coreRoot = "${fusesoc-cores}/${x.coreRoot} (get "sofa-qlhd.core" "sha256-jkB5+TZscXDqIyw45mpa4QONalfTn05Gzy0CLcavL1s=") ])) ++ (coresIn "verilator_tb_utils" (get: [ - (get "verilator_tb_utils-1.0.core" "sha256-Tiz9+fSxlYl9pTwz61K4StWMqRpoZTnLQ5uizFprg1A=") (get "verilator_tb_utils-1.1.core" "sha256-oX4xppapcEhxfZOjIUvk+fZCh03+6KT1bej3l8AgRnU=") ])) ++ (coresIn "verilog-arbiter" (get: [ (get "verilog-arbiter-r3.core" "sha256-/hgkOUn7oCSXQXWbUPprC5hpB29KRLjC3Bsz+n7yMVU=") - (get "verilog-arbiter-r2.core" "sha256-CVTdd0BBJDd8Y1FM2JIvIBb3orErjfLa9465tF7uhk0=") ])) ++ (coresIn "wb_sdram_ctrl" (get: [ - (get "wb_sdram_ctrl-r3.core" "sha256-owHpJcI2q5xsMRnpyo585T08gGwRzhycmSkpf8niFJk=") (get "wb_sdram_ctrl-r4.core" "sha256-KQU8Sf0EQrm6XIetbobzr2aCQblhmyh1tdEO1EuT1io=") ])) ++ (coresIn "yosys_cells" (get: [ (get "ecp5-0.8.core" "sha256-DdzoqCsz4z3kVsm8PFupdmdDNpG8d8Hf3dNaogvo5z4=") (get "ice40-0.7.core" "sha256-mbFqQ+85Y+/XQF/2BczqZkRV86FevRjia1BPRi0cx6A=") ])) - ++ (coresIn "fusesoc_utils" ( - get: - let - paths016 = { + ++ (coresIn "fusesoc_utils" (get: [ + ( + (get "generators-0.1.7.core" "sha256-ei2IXefe/RKa77jlZsQQ+/P0lPh2Of4+kqDSBvp9TXU=") + // { preservePaths = [ "chisel.py" "custom.py" @@ -297,50 +205,18 @@ map (x: fusesocLib.importCore (x // { coreRoot = "${fusesoc-cores}/${x.coreRoot} "template/templates/sdc.j2" "template/templates/ucf.j2" ]; - }; - paths013 = { - preservePaths = [ - "custom.py" - "gitversion.py" - "icepll.py" - ]; - }; - pathsBlinky = { + } + ) + ( + (get "blinky-1.1.core" "sha256-jUX2mpU0lmmIdf3tkpUrEVc4+kpw+8u01ymGy7bn0k0=") + // { preservePaths = [ "sw/proginfo.py" ]; - }; - in - [ - ((get "generators-0.1.7.core" "sha256-ei2IXefe/RKa77jlZsQQ+/P0lPh2Of4+kqDSBvp9TXU=") // paths016) - ((get "generators-0.1.6.core" "sha256-9BcJLSH1icMgI1vcpzq4oDvT8iHP3TOSRPsrfEdKsrY=") // paths016) - ( - (get "generators-0.1.5.core" "sha256-F3U03hw6wwsKt6vJt/4IAxe5VaNR5CHTqs/sufQZxb0=") - // { - preservePaths = [ - "custom.py" - "gitversion.py" - "icepll.py" - "template/template_generator.py" - "template/templates/constants_pkg_sv.j2" - "template/templates/constants_pkg_vhd.j2" - "template/templates/sdc.j2" - "template/templates/ucf.j2" - ]; - } - ) - ((get "generators-0.1.4.core" "sha256-15FTNPQBrvoL32PK1p4EHji1ZD8vZZ/j1Gg1NdsipFY=") // paths013) - ((get "generators-0.1.3.core" "sha256-qlStZecEKRNFNERk9LcQLS/BVxR6r/rMV1B/JI3xLRg=") // paths013) - ((get "blinky-0.core" "sha256-Fhq93SOpSBi7dB9oC1n0KM2XZFHiEzTsWsVSzBD+j5Y=") // pathsBlinky) - ((get "blinky-1.0.core" "sha256-2UhRJQ3bgv1TRPxOLQj/2Z/4IwO8aA8v+40fbm/MiHk=") // pathsBlinky) - ((get "blinky-1.1.core" "sha256-jUX2mpU0lmmIdf3tkpUrEVc4+kpw+8u01ymGy7bn0k0=") // pathsBlinky) - ] - )) + } + ) + ])) ++ (coresIn "serv" (get: [ - (get "serv-1.0.2.core" "sha256-Io5xQOURxAmNUQR4QnaL72libSPPg6xq0+8F1IdVlEw=") (get "serv-1.1.0.core" "sha256-Rm+34mE+ToeLxh4SBtgQ9TnSXn2MP/l7DaOrT+XgF5o=") - (get "servant-1.0.2-r1.core" "sha256-gfgn0J+Jrxb5V+sm3HyWuv32mM3ytr2IoVY23K23ZRI=") - (get "servant-1.0.2.core" "sha256-Io5xQOURxAmNUQR4QnaL72libSPPg6xq0+8F1IdVlEw=") (get "servant-1.1.0.core" "sha256-Rm+34mE+ToeLxh4SBtgQ9TnSXn2MP/l7DaOrT+XgF5o=") - (get "serving-1.0.2.core" "sha256-Io5xQOURxAmNUQR4QnaL72libSPPg6xq0+8F1IdVlEw=") (get "serving-1.1.0.core" "sha256-Rm+34mE+ToeLxh4SBtgQ9TnSXn2MP/l7DaOrT+XgF5o=") ])) ) diff --git a/flake.nix b/flake.nix index 8b3b1c0..5f127b0 100644 --- a/flake.nix +++ b/flake.nix @@ -117,8 +117,7 @@ dual_clock_fifo_tb fifo_tb ; - "i2c_1.15-sim" = noVendor.i2c."1.15".run.sim.withTools [ pkgs.iverilog ]; - "i2c_1.14-r1-sim" = noVendor.i2c."1.14-r1".run.sim.withTools [ pkgs.iverilog ]; + "i2c-sim" = noVendor.i2c.run.sim.withTools [ pkgs.iverilog ]; servant-tinyfpga_bx = noVendor.servant.run.tinyfpga_bx.withTools [ pkgs.icestorm pkgs.yosys -- 2.51.2