SoC: Add Nuclei demosoc support by rename hbird to demosoc

- Nuclei demosoc is the evaluation SoC running on Nuclei FPGA
evaluation board, which can be configured with different
Nuclei RISC-V Processor
- hbird SoC is renamed to demosoc
- hbird Board is renamed to nuclei_fpga_eval

Signed-off-by: Huaqi Fang <578567190@qq.com>

.gitlab-ci.yml

@@ -11,7 +11,7 @@ before_script:
 stages:
     - doc_build
     - doc_deploy
-    - build_hbird_eval
+    - build_nuclei_fpga_eval
     - build_gd32vf103v_eval
     - build_gd32vf103v_rvstar
 
@@ -80,94 +80,94 @@ deploy_website:
     dependencies:
         - build_doc
 
-## Jobs for board hbird_eval
-.build_hbird_eval_job_template: &build_hbird_eval_job_def
-    stage: build_hbird_eval
+## Jobs for board nuclei_fpga_eval
+.build_nuclei_fpga_eval_job_template: &build_nuclei_fpga_eval_job_def
+    stage: build_nuclei_fpga_eval
     tags:
         - env::native
         - host::xls01
     script:
-        - SOC=hbird BOARD=hbird_eval nsdk_build_directory    application
-        - SOC=hbird BOARD=hbird_eval nsdk_build_directory    test
+        - SOC=demosoc BOARD=nuclei_fpga_eval nsdk_build_directory    application
+        - SOC=demosoc BOARD=nuclei_fpga_eval nsdk_build_directory    test
 
-# Build For HBird Evaluation Board with N307 Core, with Flash, FlashXIP, ILM, DDR Mode
-build_hbird_eval_ilm_n307:
+# Build For Nuclei FPGA Evaluation Board with N307 Core, with Flash, FlashXIP, ILM, DDR Mode
+build_nuclei_fpga_eval_ilm_n307:
     variables:
         DOWNLOAD: "ilm"
         CORE: "n307"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_flash_n307:
+build_nuclei_fpga_eval_flash_n307:
     variables:
         DOWNLOAD: "flash"
         CORE: "n307"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_flashxip_n307:
+build_nuclei_fpga_eval_flashxip_n307:
     variables:
         DOWNLOAD: "flashxip"
         CORE: "n307"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_ddr_n307:
+build_nuclei_fpga_eval_ddr_n307:
     variables:
         DOWNLOAD: "ddr"
         CORE: "n307"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
 # Build For N205E, with Flash, FlashXIP, ILM, DDR Mode
-build_hbird_eval_ilm_n205e:
+build_nuclei_fpga_eval_ilm_n205e:
     variables:
         DOWNLOAD: "ilm"
         CORE: "n205e"
         FIND_IGNORE: "! -wholename \"*dsp*\""
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_flash_n205e:
+build_nuclei_fpga_eval_flash_n205e:
     variables:
         DOWNLOAD: "flash"
         CORE: "n205e"
         FIND_IGNORE: "! -wholename \"*dsp*\""
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_flashxip_n205e:
+build_nuclei_fpga_eval_flashxip_n205e:
     variables:
         DOWNLOAD: "flashxip"
         CORE: "n205e"
         FIND_IGNORE: "! -wholename \"*dsp*\""
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_ddr_n205e:
+build_nuclei_fpga_eval_ddr_n205e:
     variables:
         DOWNLOAD: "ddr"
         CORE: "n205e"
         FIND_IGNORE: "! -wholename \"*dsp*\""
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
 # Build For NX600, with Flash, FlashXIP, ILM, DDR Mode
-build_hbird_eval_ilm_nx600:
+build_nuclei_fpga_eval_ilm_nx600:
     variables:
         DOWNLOAD: "ilm"
         CORE: "nx600"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_ddr_nx600:
+build_nuclei_fpga_eval_ddr_nx600:
     variables:
         DOWNLOAD: "ddr"
         CORE: "nx600"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_flash_nx600:
+build_nuclei_fpga_eval_flash_nx600:
     variables:
         DOWNLOAD: "flash"
         CORE: "nx600"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
-build_hbird_eval_flashxip_nx600:
+build_nuclei_fpga_eval_flashxip_nx600:
     variables:
         DOWNLOAD: "flashxip"
         CORE: "nx600"
-    <<: *build_hbird_eval_job_def
+    <<: *build_nuclei_fpga_eval_job_def
 
 ## Jobs for board gd32vf103v_eval
 .build_gd32vf103v_eval_job_template: &build_gd32vf103v_eval_job_def

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 ?= hbird
+# SOC ?= demosoc
 # DOWNLOAD ?= ilm
 EXTRA_MKS := $(wildcard Makefile.local $(NUCLEI_SDK_BUILD)/Makefile.global)
 ifneq ("$(strip $(EXTRA_MKS))", "")
@@ -17,7 +17,7 @@ endif
 # BOARD and SOC name should always be lower-case
 ## Available choices:
 ## The name of sub directories in $(NUCLEI_SDK_ROOT)/SoC/
-SOC ?= hbird
+SOC ?= demosoc
 ## Available choices:
 ## ilm: Program will be download into ilm/ram and run directly in ilm/ram, program lost when poweroff
 ## flash: Program will be download into flash, when running, program will be copied to ilm/ram and run in ilm/ram

Build/Makefile.files.hbird → Build/Makefile.files.demosoc

@@ -3,8 +3,8 @@ INCDIRS += $(NUCLEI_SDK_SOC_COMMON)/Include
 C_SRCDIRS += $(NUCLEI_SDK_SOC_COMMON)/Source $(NUCLEI_SDK_SOC_COMMON)/Source/Drivers \
 		$(NUCLEI_SDK_SOC_COMMON)/Source/Stubs
 
-ASM_SRCS += $(NUCLEI_SDK_SOC_COMMON)/Source/GCC/startup_hbird.S \
-		$(NUCLEI_SDK_SOC_COMMON)/Source/GCC/intexc_hbird.S
+ASM_SRCS += $(NUCLEI_SDK_SOC_COMMON)/Source/GCC/startup_demosoc.S \
+		$(NUCLEI_SDK_SOC_COMMON)/Source/GCC/intexc_demosoc.S
 
 # Add extra board related source files and header files
 VALID_NUCLEI_SDK_SOC_BOARD=$(wildcard $(NUCLEI_SDK_SOC_BOARD))

Build/Makefile.rules

@@ -32,27 +32,27 @@ info:
 help:
 	@$(ECHO) "Nuclei N/NX-series RISC-V Embedded Processor Software Development Kit "
 	@$(ECHO) "== Make variables used in Nuclei SDK =="
-	@$(ECHO) "SOC:         Select SoC built in Nuclei SDK, will select hbird by default"
-	@$(ECHO) "BOARD:       Select SoC's Board built in Nuclei SDK, will select hbird_eval by default"
-	@$(ECHO) "CORE:        Not required for all SoCs, currently only hbird require it, n307fd by default"
+	@$(ECHO) "SOC:         Select SoC built in Nuclei SDK, will select demosoc 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) "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 =="
 	@$(ECHO) "1. Build Application:"
-	@$(ECHO) "all [PROGRAM=flash/flashxip/ilm]"
+	@$(ECHO) "all [PROGRAM=flash/flashxip/ilm/ddr]"
 	@$(ECHO) "   Build a software program to load with the debugger."
 	@$(ECHO) "2. Upload Application to Board using OpenOCD and GDB:"
-	@$(ECHO) "upload [PROGRAM=flash/flashxip/ilm]"
+	@$(ECHO) "upload [PROGRAM=flash/flashxip/ilm/ddr]"
 	@$(ECHO) "   Launch OpenOCD to flash your program to the on-board Flash."
 	@$(ECHO) "3:(Option 1) Debug Application using OpenOCD and GDB"
 	@$(ECHO) "  3.1: run_openocd"
-	@$(ECHO) "  3.2: run_gdb [PROGRAM=flash/flashxip/ilm]"
+	@$(ECHO) "  3.2: run_gdb [PROGRAM=flash/flashxip/ilm/ddr]"
 	@$(ECHO) "   Step 1: Launch OpenOCD for Debugger connection: make run_openocd"
 	@$(ECHO) "   Step 2: Launch GDB to connect openocd server, you can set breakpoints using gdb and debug it."
 	@$(ECHO) "           If you want to load your application, you need to run load in gdb command terminal"
 	@$(ECHO) "           to load your program, then use gdb to debug it."
 	@$(ECHO) "3:(Option 2) Debug Application using OpenOCD and GDB"
-	@$(ECHO) "debug [PROGRAM=flash/flashxip/ilm]"
+	@$(ECHO) "debug [PROGRAM=flash/flashxip/ilm/ddr]"
 	@$(ECHO) "   Launch GDB and OpenOCD to debug your application on-board, you can set breakpoints using gdb and debug it."
 	@$(ECHO) "           If you want to load your application, you need to run load in gdb command terminal"
 	@$(ECHO) "           to load your program, then use gdb to debug it."

Build/Makefile.soc.hbird → Build/Makefile.soc.demosoc

@@ -1,20 +1,20 @@
-BOARD ?= hbird_eval
+BOARD ?= nuclei_fpga_eval
 CORE ?= n307fd
 
 NUCLEI_SDK_SOC_BOARD=$(NUCLEI_SDK_SOC)/Board/$(BOARD)
 NUCLEI_SDK_SOC_COMMON=$(NUCLEI_SDK_SOC)/Common
 
-OPENOCD_CFG ?= $(NUCLEI_SDK_SOC_BOARD)/openocd_hbird.cfg
+OPENOCD_CFG ?= $(NUCLEI_SDK_SOC_BOARD)/openocd_demosoc.cfg
 ifeq ($(DOWNLOAD),ilm)
-LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_hbird_ilm.ld
+LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_demosoc_ilm.ld
 else
 ifeq ($(DOWNLOAD),ddr)
-LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_hbird_ddr.ld
+LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_demosoc_ddr.ld
 else
 ifeq ($(DOWNLOAD),flashxip)
-LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_hbird_flashxip.ld
+LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_demosoc_flashxip.ld
 else
-LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_hbird_flash.ld
+LINKER_SCRIPT ?= $(NUCLEI_SDK_SOC_BOARD)/Source/GCC/gcc_demosoc_flash.ld
 endif
 endif
 endif

SoC/hbird/Board/hbird_eval/Include/board_hbird_eval.h → SoC/demosoc/Board/nuclei_fpga_eval/Include/board_nuclei_fpga_eval.h

@@ -1,6 +1,6 @@
 // See LICENSE for license details.
-#ifndef _BOARD_HBIRD_EVAL_H_
-#define _BOARD_HBIRD_EVAL_H_
+#ifndef _BOARD_NUCLEI_FPGA_EVAL_H_
+#define _BOARD_NUCLEI_FPGA_EVAL_H_
 
 #ifdef __cplusplus
  extern "C" {

SoC/hbird/Board/hbird_eval/Include/nuclei_sdk_hal.h → SoC/demosoc/Board/nuclei_fpga_eval/Include/nuclei_sdk_hal.h

@@ -6,7 +6,7 @@
  extern "C" {
 #endif
 
-#include "board_hbird_eval.h"
+#include "board_nuclei_fpga_eval.h"
 
 #define SOC_DEBUG_UART      UART0
 

SoC/hbird/Board/hbird_eval/Source/GCC/gcc_hbird_ddr.ld → SoC/demosoc/Board/nuclei_fpga_eval/Source/GCC/gcc_demosoc_ddr.ld

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * @file     gcc_hbird_ddr.ld
+ * @file     gcc_demosoc_ddr.ld
  * @brief    GNU Linker Script for Nuclei N/NX based device in ddr Download Mode
  * @version  V1.0.0
  * @date     20. Jul 2020

SoC/hbird/Board/hbird_eval/Source/GCC/gcc_hbird_flash.ld → SoC/demosoc/Board/nuclei_fpga_eval/Source/GCC/gcc_demosoc_flash.ld

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * @file     gcc_hbird_flash.ld
+ * @file     gcc_demosoc_flash.ld
  * @brief    GNU Linker Script for Nuclei N/NX based device in Flash Download Mode
  * @version  V1.0.0
  * @date     17. Dec 2019

SoC/hbird/Board/hbird_eval/Source/GCC/gcc_hbird_flashxip.ld → SoC/demosoc/Board/nuclei_fpga_eval/Source/GCC/gcc_demosoc_flashxip.ld

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * @file     gcc_hbird_flashxip.ld
+ * @file     gcc_demosoc_flashxip.ld
  * @brief    GNU Linker Script for Nuclei N/NX based device in FlashXIP Download Mode
  * @version  V1.0.0
  * @date     17. Dec 2019

SoC/hbird/Board/hbird_eval/Source/GCC/gcc_hbird_ilm.ld → SoC/demosoc/Board/nuclei_fpga_eval/Source/GCC/gcc_demosoc_ilm.ld

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * @file     gcc_hbird_ilm.ld
+ * @file     gcc_demosoc_ilm.ld
  * @brief    GNU Linker Script for Nuclei N/NX based device in ilm Download Mode
  * @version  V1.0.0
  * @date     17. Dec 2019

SoC/hbird/Common/Include/hbird.h → SoC/demosoc/Common/Include/demosoc.h

@@ -1,5 +1,5 @@
 /******************************************************************************
- * @file     hbird.h
+ * @file     demosoc.h
  * @brief    NMSIS Core Peripheral Access Layer Header File for
  *           Nuclei HummingBird evaluation SoC which support Nuclei N/NX class cores
  * @version  V1.00
@@ -23,8 +23,8 @@
  * limitations under the License.
  */
 
-#ifndef __HBIRD_H__
-#define __HBIRD_H__
+#ifndef __DEMOSOC_H__
+#define __DEMOSOC_H__
 
 #include <stddef.h>
 
@@ -37,7 +37,7 @@ extern "C" {
   */
 
 
-/** @addtogroup hbird
+/** @addtogroup demosoc
   * @{
   */
 
@@ -76,7 +76,7 @@ typedef enum IRQn
     Reserved15_IRQn           =  17,              /*!<  Internal reserved */
     Reserved16_IRQn           =  18,              /*!<  Internal reserved */
 
-/* ===========================================  hbird Specific Interrupt Numbers  ========================================= */
+/* ===========================================  demosoc Specific Interrupt Numbers  ========================================= */
 /* ToDo: add here your device specific external interrupt numbers. 19~1023 is reserved number for user. Maxmum interrupt supported
          could get from clicinfo.NUM_INTERRUPT. According the interrupt handlers defined in startup_Device.s
          eg.: Interrupt for Timer#1       eclic_tim1_handler   ->   TIM1_IRQn */
@@ -158,7 +158,7 @@ typedef enum EXCn {
 
 #endif /* __riscv_xlen == 64 */
 
-/* ToDo: define the correct core features for the hbird */
+/* ToDo: define the correct core features for the demosoc */
 #define __ECLIC_PRESENT           1                     /*!< Set to 1 if ECLIC is present */
 #define __ECLIC_BASEADDR          0x0C000000UL          /*!< Set to ECLIC baseaddr of your device */
 
@@ -188,9 +188,9 @@ typedef enum EXCn {
 
 
 #include <nmsis_core.h>                         /*!< Nuclei N/NX class processor and core peripherals */
-/* ToDo: include your system_hbird.h file
+/* ToDo: include your system_demosoc.h file
          replace 'Device' with your device name */
-#include "system_hbird.h"                    /*!< hbird System */
+#include "system_demosoc.h"                    /*!< demosoc System */
 
 
 /* ========================================  Start of section using anonymous unions  ======================================== */
@@ -359,7 +359,7 @@ typedef struct {
     __IOM uint8_t CSR; /* CR and SR in same address */
 } I2C_TypeDef;
 
-/*@}*/ /* end of group hbird_Peripherals */
+/*@}*/ /* end of group demosoc_Peripherals */
 
 
 /* =========================================  End of section using anonymous unions  ========================================= */
@@ -385,21 +385,21 @@ typedef struct {
 #define ONCHIP_ROM_BASE         (0x00001000UL)      /*!< (ROM       ) Base Address */
 #define ONCHIP_ILM_BASE         (0x80000000UL)      /*!< (ILM       ) Base Address */
 #define ONCHIP_DLM_BASE         (0x90000000UL)      /*!< (DLM       ) Base Address */
-#define HBIRD_PERIPH_BASE       (0x10000000UL)      /*!< (Peripheral) Base Address */
+#define DEMOSOC_PERIPH_BASE       (0x10000000UL)      /*!< (Peripheral) Base Address */
 
 /* Peripheral memory map */
 /* Fast-IO Interfaced IP */
-#define GPIO_BASE               (HBIRD_PERIPH_BASE + 0x12000)          /*!< (GPIO) Base Address */
+#define GPIO_BASE               (DEMOSOC_PERIPH_BASE + 0x12000)          /*!< (GPIO) Base Address */
 /* PPI Interfaced IP */
-#define UART0_BASE              (HBIRD_PERIPH_BASE + 0x13000)          /*!< (UART0) Base Address */
-#define QSPI0_BASE              (HBIRD_PERIPH_BASE + 0x14000)          /*!< (QSPI0) Base Address */
-#define PWM0_BASE               (HBIRD_PERIPH_BASE + 0x15000)          /*!< (PWM0) Base Address */
-#define UART1_BASE              (HBIRD_PERIPH_BASE + 0x23000)          /*!< (UART1) Base Address */
-#define QSPI1_BASE              (HBIRD_PERIPH_BASE + 0x24000)          /*!< (QSPI1) Base Address */
-#define PWM1_BASE               (HBIRD_PERIPH_BASE + 0x25000)          /*!< (PWM1) Base Address */
-#define QSPI2_BASE              (HBIRD_PERIPH_BASE + 0x34000)          /*!< (QSPI2) Base Address */
-#define PWM2_BASE               (HBIRD_PERIPH_BASE + 0x35000)          /*!< (PWM2) Base Address */
-#define I2C_BASE                (HBIRD_PERIPH_BASE + 0x42000)          /*!< (I2C Master) Base Address */
+#define UART0_BASE              (DEMOSOC_PERIPH_BASE + 0x13000)          /*!< (UART0) Base Address */
+#define QSPI0_BASE              (DEMOSOC_PERIPH_BASE + 0x14000)          /*!< (QSPI0) Base Address */
+#define PWM0_BASE               (DEMOSOC_PERIPH_BASE + 0x15000)          /*!< (PWM0) Base Address */
+#define UART1_BASE              (DEMOSOC_PERIPH_BASE + 0x23000)          /*!< (UART1) Base Address */
+#define QSPI1_BASE              (DEMOSOC_PERIPH_BASE + 0x24000)          /*!< (QSPI1) Base Address */
+#define PWM1_BASE               (DEMOSOC_PERIPH_BASE + 0x25000)          /*!< (PWM1) Base Address */
+#define QSPI2_BASE              (DEMOSOC_PERIPH_BASE + 0x34000)          /*!< (QSPI2) Base Address */
+#define PWM2_BASE               (DEMOSOC_PERIPH_BASE + 0x35000)          /*!< (PWM2) Base Address */
+#define I2C_BASE                (DEMOSOC_PERIPH_BASE + 0x42000)          /*!< (I2C Master) Base Address */
 
 /** @} */ /* End of group Device_Peripheral_peripheralAddr */
 
@@ -448,7 +448,7 @@ typedef struct {
 uint32_t get_cpu_freq();
 void delay_1ms(uint32_t count);
 
-/** @} */ /* End of group hbird */
+/** @} */ /* End of group demosoc */
 
 /** @} */ /* End of group Nuclei */
 
@@ -456,4 +456,4 @@ void delay_1ms(uint32_t count);
 }
 #endif
 
-#endif  /* __HBIRD_H__ */
+#endif  /* __DEMOSOC_H__ */

SoC/hbird/Common/Include/hbird_gpio.h → SoC/demosoc/Common/Include/demosoc_gpio.h

@@ -1,6 +1,6 @@
 // See LICENSE for license details.
-#ifndef _HBIRD_GPIO_H
-#define _HBIRD_GPIO_H
+#ifndef _DEMOSOC_GPIO_H
+#define _DEMOSOC_GPIO_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -53,4 +53,4 @@ int32_t gpio_clear_interrupt(GPIO_TypeDef *gpio, uint32_t mask, GPIO_INT_TYPE ty
 #ifdef __cplusplus
 }
 #endif
-#endif /* _HBIRD_GPIO_H */
+#endif /* _DEMOSOC_GPIO_H */

SoC/hbird/Common/Include/hbird_i2c.h → SoC/demosoc/Common/Include/demosoc_i2c.h

@@ -1,7 +1,7 @@
 //See LICENSE for license details
 
-#ifndef _HBIRD_I2C_H
-#define _HBIRD_I2C_H
+#ifndef _DEMOSOC_I2C_H
+#define _DEMOSOC_I2C_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -38,7 +38,7 @@
 /*fileds*/
 
 #define I2C_CTR_ENABLE          1
-#define I2C_CTR_DISABLE         0 
+#define I2C_CTR_DISABLE         0
 
 #define I2C_CTR_INTEN           1
 #define I2C_CTR_INTDIS          0
@@ -53,4 +53,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* _HBIRD_I2C_H */
+#endif /* _DEMOSOC_I2C_H */

SoC/hbird/Common/Include/hbird_pwm.h → SoC/demosoc/Common/Include/demosoc_pwm.h

@@ -1,7 +1,7 @@
 // See LICENSE for license details.
 
-#ifndef _HBIRD_PWM_H
-#define _HBIRD_PWM_H
+#ifndef _DEMOSOC_PWM_H
+#define _DEMOSOC_PWM_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -41,4 +41,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* _HBIRD_PWM_H */
+#endif /* _DEMOSOC_PWM_H */

SoC/hbird/Common/Include/hbird_spi.h → SoC/demosoc/Common/Include/demosoc_spi.h

@@ -1,7 +1,7 @@
 // See LICENSE for license details.
 
-#ifndef _HBIRD_SPI_H
-#define _HBIRD_SPI_H
+#ifndef _DEMOSOC_SPI_H
+#define _DEMOSOC_SPI_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -61,8 +61,8 @@
 #define SPI_INSN_CMD_CODE(x)    (((x) & 0xff) << 16)
 #define SPI_INSN_PAD_CODE(x)    (((x) & 0xff) << 24)
 
-#define SPI_TXFIFO_FULL  (1 << 31)   
-#define SPI_RXFIFO_EMPTY (1 << 31)   
+#define SPI_TXFIFO_FULL  (1 << 31)
+#define SPI_RXFIFO_EMPTY (1 << 31)
 
 /* Values */
 
@@ -83,4 +83,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* _HBIRD_SPI_H */
+#endif /* _DEMOSOC_SPI_H */

SoC/hbird/Common/Include/hbird_uart.h → SoC/demosoc/Common/Include/demosoc_uart.h

@@ -1,7 +1,7 @@
 // See LICENSE for license details.
 
-#ifndef _HBIRD_UART_H
-#define _HBIRD_UART_H
+#ifndef _DEMOSOC_UART_H
+#define _DEMOSOC_UART_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -72,4 +72,4 @@ int32_t uart_disable_rxint(UART_TypeDef *uart);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _HBIRD_UART_H */
+#endif /* _DEMOSOC_UART_H */

SoC/hbird/Common/Include/nuclei_sdk_soc.h → SoC/demosoc/Common/Include/nuclei_sdk_soc.h

@@ -6,12 +6,12 @@
  extern "C" {
 #endif
 
-#include "hbird.h"
-#include "hbird_uart.h"
-#include "hbird_gpio.h"
-#include "hbird_i2c.h"
-#include "hbird_spi.h"
-#include "hbird_pwm.h"
+#include "demosoc.h"
+#include "demosoc_uart.h"
+#include "demosoc_gpio.h"
+#include "demosoc_i2c.h"
+#include "demosoc_spi.h"
+#include "demosoc_pwm.h"
 
 #ifdef __cplusplus
 }

SoC/hbird/Common/Include/system_hbird.h → SoC/demosoc/Common/Include/system_demosoc.h

@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 /*******************************************************************************
- * @file     system_hbird.h
+ * @file     system_demosoc.h
  * @brief    NMSIS Nuclei N/NX Device Peripheral Access Layer Header File for
  *           Device <Device>
  * @version  V1.00
  * @date     17. Dec 2019
  ******************************************************************************/
 
-#ifndef __SYSTEM_HBIRD_H__   /* ToDo: replace '<Device>' with your device name */
-#define __SYSTEM_HBIRD_H__
+#ifndef __SYSTEM_DEMOSOC_H__   /* ToDo: replace '<Device>' with your device name */
+#define __SYSTEM_DEMOSOC_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,12 +49,12 @@ extern void SystemInit (void);
  */
 extern void SystemCoreClockUpdate (void);
 
-/** 
+/**
  * \brief Register an exception handler for exception code EXCn
  */
 extern void Exception_Register_EXC(uint32_t EXCn, unsigned long exc_handler);
 
-/** 
+/**
  * \brief Get current exception handler for exception code EXCn
  */
 extern unsigned long Exception_Get_EXC(uint32_t EXCn);
@@ -76,4 +76,4 @@ extern int32_t ECLIC_Register_IRQ(IRQn_Type IRQn, uint8_t shv, ECLIC_TRIGGER_Typ
 }
 #endif
 
-#endif /* __SYSTEM_HBIRD_H__ */
+#endif /* __SYSTEM_DEMOSOC_H__ */

SoC/hbird/Common/Source/Drivers/hbird_gpio.c → SoC/demosoc/Common/Source/Drivers/demosoc_gpio.c

@@ -1,5 +1,5 @@
-#include "hbird.h"
-#include "hbird_gpio.h"
+#include "demosoc.h"
+#include "demosoc_gpio.h"
 
 int32_t gpio_iof_config(GPIO_TypeDef *gpio, uint32_t mask, IOF_FUNC func)
 {

SoC/hbird/Common/Source/Drivers/hbird_uart.c → SoC/demosoc/Common/Source/Drivers/demosoc_uart.c

@@ -1,5 +1,5 @@
-#include "hbird.h"
-#include "hbird_uart.h"
+#include "demosoc.h"
+#include "demosoc_uart.h"
 
 int32_t uart_init(UART_TypeDef *uart, uint32_t baudrate)
 {

SoC/hbird/Common/Source/GCC/intexc_hbird.S → SoC/demosoc/Common/Source/GCC/intexc_demosoc.S

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * \file     intexc_hbird.S
+ * \file     intexc_demosoc.S
  * \brief    NMSIS Interrupt and Exception Handling Template File
  *  for Nuclei HummingBird evaluation SoC which support Nuclei N/NX class cores
  * \version  V1.00

SoC/hbird/Common/Source/GCC/startup_hbird.S → SoC/demosoc/Common/Source/GCC/startup_demosoc.S

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * \file     startup_hbird.S
+ * \file     startup_demosoc.S
  * \brief    NMSIS Nuclei N/NX Class Core based Core Device Startup File for
  *  Nuclei HummingBird evaluation SoC which support Nuclei N/NX class cores
  * \version  V1.00

SoC/hbird/Common/Source/system_hbird.c → SoC/demosoc/Common/Source/system_demosoc.c

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 /******************************************************************************
- * @file     system_hbird.c
+ * @file     system_demosoc.c
  * @brief    NMSIS Nuclei Core Device Peripheral Access Layer Source File for
  *           Nuclei HummingBird evaluation SoC which support Nuclei N/NX class cores
  * @version  V1.00
@@ -334,7 +334,7 @@ int32_t ECLIC_Register_IRQ(IRQn_Type IRQn, uint8_t shv, ECLIC_TRIGGER_Type trig_
 void _premain_init(void)
 {
     /* TODO: Add your own initialization code here, called before main */
-    /* __ICACHE_PRESENT and __DCACHE_PRESENT are defined in hbird.h */
+    /* __ICACHE_PRESENT and __DCACHE_PRESENT are defined in demosoc.h */
 #if defined(__ICACHE_PRESENT) && __ICACHE_PRESENT == 1
     EnableICache();
 #endif