This is an automated email from the ASF dual-hosted git repository. jerzy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 334ebf21cac3d91bfe0e0baa19bd560ff47f628c Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl> AuthorDate: Wed Apr 20 15:30:13 2022 +0200 mcu/nrf5340: Move startup code form BSP to mcu No change in functionality. Source files are moved to MCU since next BSP based on NRF5340 (if any) can share startup code. Signed-off-by: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl> --- hw/mcu/nordic/nrf5340/pkg.yml | 3 ++ .../{nrf5340_net => nrf5340/startup}/pkg.yml | 35 ++-------------------- .../src/arch/cortex_m33/gcc_startup_nrf5340.s | 0 hw/mcu/nordic/nrf5340/syscfg.yml | 6 ++++ hw/mcu/nordic/nrf5340_net/pkg.yml | 4 +++ hw/mcu/nordic/nrf5340_net/{ => startup}/pkg.yml | 35 ++-------------------- .../src/arch/cortex_m33/gcc_startup_nrf5340_net.s | 0 hw/mcu/nordic/nrf5340_net/syscfg.yml | 6 ++++ 8 files changed, 25 insertions(+), 64 deletions(-) diff --git a/hw/mcu/nordic/nrf5340/pkg.yml b/hw/mcu/nordic/nrf5340/pkg.yml index 9d3406039..9aa3d530a 100644 --- a/hw/mcu/nordic/nrf5340/pkg.yml +++ b/hw/mcu/nordic/nrf5340/pkg.yml @@ -110,5 +110,8 @@ pkg.deps.NRF5340_EMBED_NET_CORE: pkg.cflags.MCU_NRF5340_EN_APPROTECT_USERHANDLING: - "-DENABLE_APPROTECT_USER_HANDLING" +pkg.deps.MCU_DEFAULT_STARTUP: + - "@apache-mynewt-core/hw/mcu/nordic/nrf5340/startup" + pkg.deps.MCU_MPU_ENABLE: - "@apache-mynewt-core/hw/mcu/nordic/nrf5340/mpu" diff --git a/hw/mcu/nordic/nrf5340_net/pkg.yml b/hw/mcu/nordic/nrf5340/startup/pkg.yml similarity index 50% copy from hw/mcu/nordic/nrf5340_net/pkg.yml copy to hw/mcu/nordic/nrf5340/startup/pkg.yml index 3216fdb77..d86ce2f2c 100644 --- a/hw/mcu/nordic/nrf5340_net/pkg.yml +++ b/hw/mcu/nordic/nrf5340/startup/pkg.yml @@ -17,38 +17,9 @@ # under the License. # -pkg.name: hw/mcu/nordic/nrf5340_net -pkg.description: MCU definition for Nordic nRF5340 ARM Cortex-M33 chip (net core). +pkg.name: hw/mcu/nordic/nrf5340/startup +pkg.description: MCU default startup code pkg.author: "Apache Mynewt <d...@mynewt.apache.org>" pkg.homepage: "http://mynewt.apache.org/" pkg.keywords: - - nrf53 - - nrfx - -pkg.deps: - - "@apache-mynewt-core/hw/mcu/nordic" - - "@apache-mynewt-core/hw/cmsis-core" - - "@apache-mynewt-core/hw/hal" - - "@apache-mynewt-core/hw/drivers/ipc_nrf5340" - -pkg.cflags.NFC_PINS_AS_GPIO: - - '-DCONFIG_NFCT_PINS_AS_GPIOS=1' - -pkg.cflags.GPIO_AS_PIN_RESET: - - '-DCONFIG_GPIO_AS_PINRESET=1' - -pkg.deps.UART_0: - - "@apache-mynewt-core/hw/drivers/uart/uart_hal" - -pkg.deps.SPI_0_MASTER: - - "@apache-mynewt-core/hw/bus" - - "@apache-mynewt-core/hw/bus/drivers/spi_hal" - -pkg.deps.I2C_0': - - "@apache-mynewt-core/hw/bus/drivers/i2c_nrf5340" - -pkg.deps.TRNG: - - "@apache-mynewt-core/hw/drivers/trng/trng_nrf52" - -pkg.deps.BLE_CONTROLLER: - - "@apache-mynewt-nimble/nimble/drivers/nrf5340" + - nrf5340 diff --git a/hw/bsp/nordic_pca10095/src/arch/cortex_m33/gcc_startup_nrf5340.s b/hw/mcu/nordic/nrf5340/startup/src/arch/cortex_m33/gcc_startup_nrf5340.s similarity index 100% rename from hw/bsp/nordic_pca10095/src/arch/cortex_m33/gcc_startup_nrf5340.s rename to hw/mcu/nordic/nrf5340/startup/src/arch/cortex_m33/gcc_startup_nrf5340.s diff --git a/hw/mcu/nordic/nrf5340/syscfg.yml b/hw/mcu/nordic/nrf5340/syscfg.yml index e0b0115e7..49525bcd8 100644 --- a/hw/mcu/nordic/nrf5340/syscfg.yml +++ b/hw/mcu/nordic/nrf5340/syscfg.yml @@ -127,6 +127,12 @@ syscfg.defs: This settings must have same value for bootloader and application build. value: 1 + MCU_DEFAULT_STARTUP: + description: > + Include default startup code. + Set to 0 if BSP provides customized startup code. + value: 1 + # MCU peripherals definitions ADC_0: description: 'Enable nRF5340 ADC 0' diff --git a/hw/mcu/nordic/nrf5340_net/pkg.yml b/hw/mcu/nordic/nrf5340_net/pkg.yml index 3216fdb77..ecedf9d57 100644 --- a/hw/mcu/nordic/nrf5340_net/pkg.yml +++ b/hw/mcu/nordic/nrf5340_net/pkg.yml @@ -52,3 +52,7 @@ pkg.deps.TRNG: pkg.deps.BLE_CONTROLLER: - "@apache-mynewt-nimble/nimble/drivers/nrf5340" + +pkg.deps.MCU_DEFAULT_STARTUP: + - "@apache-mynewt-core/hw/mcu/nordic/nrf5340_net/startup" + diff --git a/hw/mcu/nordic/nrf5340_net/pkg.yml b/hw/mcu/nordic/nrf5340_net/startup/pkg.yml similarity index 50% copy from hw/mcu/nordic/nrf5340_net/pkg.yml copy to hw/mcu/nordic/nrf5340_net/startup/pkg.yml index 3216fdb77..05681cc9e 100644 --- a/hw/mcu/nordic/nrf5340_net/pkg.yml +++ b/hw/mcu/nordic/nrf5340_net/startup/pkg.yml @@ -17,38 +17,9 @@ # under the License. # -pkg.name: hw/mcu/nordic/nrf5340_net -pkg.description: MCU definition for Nordic nRF5340 ARM Cortex-M33 chip (net core). +pkg.name: hw/mcu/nordic/nrf5340_net/startup +pkg.description: MCU default startup code pkg.author: "Apache Mynewt <d...@mynewt.apache.org>" pkg.homepage: "http://mynewt.apache.org/" pkg.keywords: - - nrf53 - - nrfx - -pkg.deps: - - "@apache-mynewt-core/hw/mcu/nordic" - - "@apache-mynewt-core/hw/cmsis-core" - - "@apache-mynewt-core/hw/hal" - - "@apache-mynewt-core/hw/drivers/ipc_nrf5340" - -pkg.cflags.NFC_PINS_AS_GPIO: - - '-DCONFIG_NFCT_PINS_AS_GPIOS=1' - -pkg.cflags.GPIO_AS_PIN_RESET: - - '-DCONFIG_GPIO_AS_PINRESET=1' - -pkg.deps.UART_0: - - "@apache-mynewt-core/hw/drivers/uart/uart_hal" - -pkg.deps.SPI_0_MASTER: - - "@apache-mynewt-core/hw/bus" - - "@apache-mynewt-core/hw/bus/drivers/spi_hal" - -pkg.deps.I2C_0': - - "@apache-mynewt-core/hw/bus/drivers/i2c_nrf5340" - -pkg.deps.TRNG: - - "@apache-mynewt-core/hw/drivers/trng/trng_nrf52" - -pkg.deps.BLE_CONTROLLER: - - "@apache-mynewt-nimble/nimble/drivers/nrf5340" + - nrf5340 diff --git a/hw/bsp/nordic_pca10095_net/src/arch/cortex_m33/gcc_startup_nrf5340_net.s b/hw/mcu/nordic/nrf5340_net/startup/src/arch/cortex_m33/gcc_startup_nrf5340_net.s similarity index 100% rename from hw/bsp/nordic_pca10095_net/src/arch/cortex_m33/gcc_startup_nrf5340_net.s rename to hw/mcu/nordic/nrf5340_net/startup/src/arch/cortex_m33/gcc_startup_nrf5340_net.s diff --git a/hw/mcu/nordic/nrf5340_net/syscfg.yml b/hw/mcu/nordic/nrf5340_net/syscfg.yml index 73b9c2291..86849853d 100644 --- a/hw/mcu/nordic/nrf5340_net/syscfg.yml +++ b/hw/mcu/nordic/nrf5340_net/syscfg.yml @@ -68,6 +68,12 @@ syscfg.defs: Default value is 0, so disabled. value: 0 + MCU_DEFAULT_STARTUP: + description: > + Include default startup code. + Set to 0 if BSP provides customized startup code. + value: 1 + # MCU peripherals definitions TRNG: description: 'Enable nRF5340 TRNG'