From ab3a1138b6c7031796c54c32805018ba7d5c7613 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 04:47:05 +0000 Subject: [PATCH 1/2] [Dependabot]: Bump neorv32 from `a0f4349` to `3d986cb` Bumps [neorv32](https://github.com/stnolting/neorv32) from `a0f4349` to `3d986cb`. - [Release notes](https://github.com/stnolting/neorv32/releases) - [Commits](https://github.com/stnolting/neorv32/compare/a0f43490eb2f1606fcda3d9fdb2a2243fac6e6f0...3d986cb7924d1ae76341e9bd444234c57c54c4e1) --- updated-dependencies: - dependency-name: neorv32 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- neorv32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neorv32 b/neorv32 index a0f4349..3d986cb 160000 --- a/neorv32 +++ b/neorv32 @@ -1 +1 @@ -Subproject commit a0f43490eb2f1606fcda3d9fdb2a2243fac6e6f0 +Subproject commit 3d986cb7924d1ae76341e9bd444234c57c54c4e1 From cc4946566417343a59897a38b8f98a54b857f678 Mon Sep 17 00:00:00 2001 From: stnolting Date: Mon, 16 Dec 2024 08:28:42 +0100 Subject: [PATCH 2/2] [osflow] use file-list file --- osflow/filesets.mk | 52 ++++------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/osflow/filesets.mk b/osflow/filesets.mk index b69cf6a..eb077a7 100644 --- a/osflow/filesets.mk +++ b/osflow/filesets.mk @@ -1,51 +1,7 @@ -NEORV32_CORE_SRC := \ - ../neorv32/rtl/core/neorv32_package.vhd \ - ../neorv32/rtl/core/neorv32_sys.vhd \ - ../neorv32/rtl/core/neorv32_clockgate.vhd \ - ../neorv32/rtl/core/neorv32_fifo.vhd \ - ../neorv32/rtl/core/neorv32_cpu_decompressor.vhd \ - ../neorv32/rtl/core/neorv32_cpu_control.vhd \ - ../neorv32/rtl/core/neorv32_cpu_regfile.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_shifter.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_muldiv.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_bitmanip.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_fpu.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_cfu.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_cond.vhd \ - ../neorv32/rtl/core/neorv32_cpu_cp_crypto.vhd \ - ../neorv32/rtl/core/neorv32_cpu_alu.vhd \ - ../neorv32/rtl/core/neorv32_cpu_lsu.vhd \ - ../neorv32/rtl/core/neorv32_cpu_pmp.vhd \ - ../neorv32/rtl/core/neorv32_cpu.vhd \ - ../neorv32/rtl/core/neorv32_bus.vhd \ - ../neorv32/rtl/core/neorv32_cache.vhd \ - ../neorv32/rtl/core/neorv32_dma.vhd \ - ../neorv32/rtl/core/neorv32_boot_rom.vhd \ - ../neorv32/rtl/core/neorv32_xip.vhd \ - ../neorv32/rtl/core/neorv32_xbus.vhd \ - ../neorv32/rtl/core/neorv32_cfs.vhd \ - ../neorv32/rtl/core/neorv32_sdi.vhd \ - ../neorv32/rtl/core/neorv32_gpio.vhd \ - ../neorv32/rtl/core/neorv32_wdt.vhd \ - ../neorv32/rtl/core/neorv32_mtime.vhd \ - ../neorv32/rtl/core/neorv32_uart.vhd \ - ../neorv32/rtl/core/neorv32_spi.vhd \ - ../neorv32/rtl/core/neorv32_twi.vhd \ - ../neorv32/rtl/core/neorv32_pwm.vhd \ - ../neorv32/rtl/core/neorv32_trng.vhd \ - ../neorv32/rtl/core/neorv32_neoled.vhd \ - ../neorv32/rtl/core/neorv32_xirq.vhd \ - ../neorv32/rtl/core/neorv32_gptmr.vhd \ - ../neorv32/rtl/core/neorv32_onewire.vhd \ - ../neorv32/rtl/core/neorv32_slink.vhd \ - ../neorv32/rtl/core/neorv32_crc.vhd \ - ../neorv32/rtl/core/neorv32_sysinfo.vhd \ - ../neorv32/rtl/core/neorv32_debug_dtm.vhd \ - ../neorv32/rtl/core/neorv32_debug_auth.vhd \ - ../neorv32/rtl/core/neorv32_debug_dm.vhd \ - ../neorv32/rtl/core/neorv32_top.vhd \ - ../neorv32/rtl/core/neorv32_application_image.vhd \ - ../neorv32/rtl/core/neorv32_bootloader_image.vhd +# read default SoC file-list file +NEORV32_HOME = ../neorv32 +NEORV32_SOC_FILE = $(shell cat $(NEORV32_HOME)/rtl/file_list_soc.f) +NEORV32_CORE_SRC = $(subst NEORV32_RTL_PATH_PLACEHOLDER, $(NEORV32_HOME)/rtl, $(NEORV32_SOC_FILE)) # Before including this partial makefile, NEORV32_MEM_SRC needs to be set # (containing two VHDL sources: one for IMEM and one for DMEM)