Просмотр исходного кода

Build: remove SOC=demosoc, use SOC=evalsoc now

Signed-off-by: Huaqi Fang <578567190@qq.com>
Huaqi Fang 2 лет назад
Родитель
Сommit
0560ec930b
4 измененных файлов с 12 добавлено и 19 удалено
  1. 1 1
      Build/Makefile.base
  2. 2 9
      Build/Makefile.conf
  3. 6 6
      Build/Makefile.rules
  4. 3 3
      Build/Makefile.soc

+ 1 - 1
Build/Makefile.base

@@ -4,7 +4,7 @@ NUCLEI_SDK_BUILD = $(NUCLEI_SDK_ROOT)/Build
 # Makefile.global should be placed in $(NUCLEI_SDK_ROOT)/Build
 # Makefile.local should be placed together with application Makefile in your own application folder
 # Sample content for this Makefile.local or Makefile.global
-# SOC ?= demosoc
+# SOC ?= evalsoc
 # DOWNLOAD ?= ilm
 EXTRA_MKS := $(wildcard Makefile.local $(NUCLEI_SDK_BUILD)/Makefile.global)
 ifneq ("$(strip $(EXTRA_MKS))", "")

+ 2 - 9
Build/Makefile.conf

@@ -82,7 +82,7 @@ endif
 
 ## QEMU/XLSPIKE options
 QEMU_OPT += -icount shift=0
-## xlspike is only valid for nuclei demosoc/evalsoc
+## xlspike is only valid for nuclei evalsoc
 ifneq ($(SMP),)
 XLSPIKE_OPT += -p$(SMP)
 endif
@@ -114,14 +114,7 @@ LDFLAGS += -T $(LINKER_SCRIPT) -nostartfiles -Wl,-Map=$(TARGET).map \
 		$(LIB_OPT) -Wl,--start-group $(LDLIBS) -Wl,--end-group
 
 # Prerequesties
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.base
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.soc
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.conf
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.core
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.files
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.misc
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.rules
-MAKEFILE_PREREQS += $(NUCLEI_SDK_BUILD)/Makefile.toolchain
+MAKEFILE_PREREQS += $(wildcard $(NUCLEI_SDK_BUILD)/Makefile.*)
 MAKEFILE_PREREQS += $(EXTRA_MKS)
 MAKEFILE_PREREQS += Makefile
 

+ 6 - 6
Build/Makefile.rules

@@ -53,10 +53,10 @@ help:
 	@$(ECHO) "Nuclei N/NX-series RISC-V Embedded Processor Software Development Kit "
 	@$(ECHO) "== For detailed user guide, please check https://doc.nucleisys.com/nuclei_sdk/"
 	@$(ECHO) "== Make variables used in Nuclei SDK =="
-	@$(ECHO) "SOC:         Select SoC built in Nuclei SDK, will select demosoc by default"
+	@$(ECHO) "SOC:         Select SoC built in Nuclei SDK, will select evalsoc by default"
 	@$(ECHO) "BOARD:       Select SoC's Board built in Nuclei SDK, will select nuclei_fpga_eval by default"
-	@$(ECHO) "CORE:        Not required for all SoCs, currently only demosoc require it, n307fd by default"
-	@$(ECHO) "ARCH_EXT:    Not required for all SoCs, currently only demosoc require it, such as ARCH_EXT=bp, means B, P extension"
+	@$(ECHO) "CORE:        Not required for all SoCs, currently only evalsoc require it, n307fd by default"
+	@$(ECHO) "ARCH_EXT:    Not required for all SoCs, currently only evalsoc require it, such as ARCH_EXT=_zba_zbb_zbc_zbs_xxldspn3x, means B and Nuclei DSP(p v0.5.3) with N1/N2/N3 extension, please use >= gcc 13"
 	@$(ECHO) "DOWNLOAD:    Not required for all SoCs, use ilm by default, optional flashxip/ilm/flash/ddr"
 	@$(ECHO) "V:           V=1 verbose make, will print more information, by default V=0"
 	@$(ECHO) "== How to Use with Make =="
@@ -139,20 +139,20 @@ debug: $(TARGET_ELF)
 	$(GDB) $< -ex "set remotetimeout 240" \
 	-ex "target remote $(GDBREMOTE)"
 
-# just for demosoc purpose
+# just for evalsoc purpose
 run_qemu: $(TARGET_ELF)
 	@$(ECHO) "Run program $< on $(QEMU)"
 	$(QEMU) -M $(QEMU_MACHINE) -cpu $(QEMU_CPU) $(QEMU_OPT) \
 		-nodefaults -nographic -serial stdio -kernel $<
 
-# just for demosoc purpose
+# just for evalsoc purpose
 run_qemu_debug: $(TARGET_ELF)
 	@$(ECHO) "Run program $< on $(QEMU), and waiting for gdb connection on port $(GDB_PORT)"
 	@$(ECHO) "Then you can open a new terminal in the same directory and run make target: run_gdb to connect to this gdb connection"
 	$(QEMU) -M $(QEMU_MACHINE) -cpu $(QEMU_CPU) $(QEMU_OPT) \
 		-nodefaults -nographic -serial stdio -kernel $< -S -gdb tcp::$(GDB_PORT)
 
-# just works on demosoc purpose, experimental support
+# just works on evalsoc purpose, experimental support
 run_xlspike: $(TARGET_ELF)
 	@$(ECHO) "Run program $< on $(XLSPIKE)"
 	$(XLSPIKE) $(XLSPIKE_OPT) --isa $(RISCV_ARCH) $<

+ 3 - 3
Build/Makefile.soc

@@ -1,6 +1,6 @@
-ifeq ($(SOC),hbird)
-$(warning SOC hbird is renamed to demosoc since Nuclei SDK 0.3.1, please use SOC=demosoc now)
-override SOC := demosoc
+ifeq ($(SOC),demosoc)
+$(warning SOC demosoc is deprecated since Nuclei SDK 0.5.0, please use SOC=evalsoc now)
+override SOC := evalsoc
 endif
 
 # Check if the SOC is valid, if there is only one SoC in this folder, force it to be the only SoC