update make build system rename pca10095 to nrf5340dk

16 files changed, 42 insertions, 42 deletions

diff --git a/hw/bsp/nrf/boards/adafruit_clue/board.mk b/hw/bsp/nrf/boards/adafruit_clue/board.mk
index b80807963..e6fcdd9b0 100644
--- a/hw/bsp/nrf/boards/adafruit_clue/board.mk
+++ b/hw/bsp/nrf/boards/adafruit_clue/board.mk
@@ -2,7 +2,7 @@ MCU_VARIANT = nrf52840
 CFLAGS += -DNRF52840_XXAA
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/nrf/linker/nrf52840_s140_v6.ld
+LD_FILE = ${FAMILY_PATH}/linker/nrf52840_s140_v6.ld
 
 $(BUILD)/$(PROJECT).zip: $(BUILD)/$(PROJECT).hex
 	adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0xFFFE --application $^ $@
diff --git a/hw/bsp/nrf/boards/circuitplayground_bluefruit/board.mk b/hw/bsp/nrf/boards/circuitplayground_bluefruit/board.mk
index b80807963..e6fcdd9b0 100644
--- a/hw/bsp/nrf/boards/circuitplayground_bluefruit/board.mk
+++ b/hw/bsp/nrf/boards/circuitplayground_bluefruit/board.mk
@@ -2,7 +2,7 @@ MCU_VARIANT = nrf52840
 CFLAGS += -DNRF52840_XXAA
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/nrf/linker/nrf52840_s140_v6.ld
+LD_FILE = ${FAMILY_PATH}/linker/nrf52840_s140_v6.ld
 
 $(BUILD)/$(PROJECT).zip: $(BUILD)/$(PROJECT).hex
 	adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0xFFFE --application $^ $@
diff --git a/hw/bsp/nrf/boards/feather_nrf52840_express/board.mk b/hw/bsp/nrf/boards/feather_nrf52840_express/board.mk
index 488f07b82..d33b3558a 100644
--- a/hw/bsp/nrf/boards/feather_nrf52840_express/board.mk
+++ b/hw/bsp/nrf/boards/feather_nrf52840_express/board.mk
@@ -5,7 +5,7 @@ CFLAGS += -DNRF52840_XXAA
 MAX3421_HOST = 1
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/nrf/linker/nrf52840_s140_v6.ld
+LD_FILE = ${FAMILY_PATH}/linker/nrf52840_s140_v6.ld
 
 $(BUILD)/$(PROJECT).zip: $(BUILD)/$(PROJECT).hex
 	adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0xFFFE --application $^ $@
diff --git a/hw/bsp/nrf/boards/feather_nrf52840_sense/board.mk b/hw/bsp/nrf/boards/feather_nrf52840_sense/board.mk
index b80807963..e6fcdd9b0 100644
--- a/hw/bsp/nrf/boards/feather_nrf52840_sense/board.mk
+++ b/hw/bsp/nrf/boards/feather_nrf52840_sense/board.mk
@@ -2,7 +2,7 @@ MCU_VARIANT = nrf52840
 CFLAGS += -DNRF52840_XXAA
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/nrf/linker/nrf52840_s140_v6.ld
+LD_FILE = ${FAMILY_PATH}/linker/nrf52840_s140_v6.ld
 
 $(BUILD)/$(PROJECT).zip: $(BUILD)/$(PROJECT).hex
 	adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0xFFFE --application $^ $@
diff --git a/hw/bsp/nrf/boards/itsybitsy_nrf52840/board.mk b/hw/bsp/nrf/boards/itsybitsy_nrf52840/board.mk
index b80807963..e6fcdd9b0 100644
--- a/hw/bsp/nrf/boards/itsybitsy_nrf52840/board.mk
+++ b/hw/bsp/nrf/boards/itsybitsy_nrf52840/board.mk
@@ -2,7 +2,7 @@ MCU_VARIANT = nrf52840
 CFLAGS += -DNRF52840_XXAA
 
 # All source paths should be relative to the top level.
-LD_FILE = hw/bsp/nrf/linker/nrf52840_s140_v6.ld
+LD_FILE = ${FAMILY_PATH}/linker/nrf52840_s140_v6.ld
 
 $(BUILD)/$(PROJECT).zip: $(BUILD)/$(PROJECT).hex
 	adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0xFFFE --application $^ $@
diff --git a/hw/bsp/nrf/boards/nrf52833dk/board.mk b/hw/bsp/nrf/boards/nrf52833dk/board.mk
index 5fba269b7..7cf00cbc1 100644
--- a/hw/bsp/nrf/boards/nrf52833dk/board.mk
+++ b/hw/bsp/nrf/boards/nrf52833dk/board.mk
@@ -1,7 +1,7 @@
 MCU_VARIANT = nrf52833
 CFLAGS += -DNRF52833_XXAA
 
-LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52833_xxaa.ld
+LD_FILE = ${FAMILY_PATH}/linker/nrf52833_xxaa.ld
 
 # flash using jlink
 flash: flash-jlink
diff --git a/hw/bsp/nrf/boards/nrf5340dk/board.cmake b/hw/bsp/nrf/boards/nrf5340dk/board.cmake
new file mode 100644
index 000000000..fe766dd78
--- /dev/null
+++ b/hw/bsp/nrf/boards/nrf5340dk/board.cmake
@@ -0,0 +1,4 @@
+set(MCU_VARIANT nrf5340)
+
+function(update_board TARGET)
+endfunction()
diff --git a/hw/bsp/nrf/boards/pca10095/board.h b/hw/bsp/nrf/boards/nrf5340dk/board.h
index 1c7981049..1c7981049 100644
--- a/hw/bsp/nrf/boards/pca10095/board.h
+++ b/hw/bsp/nrf/boards/nrf5340dk/board.h
diff --git a/hw/bsp/nrf/boards/pca10095/board.mk b/hw/bsp/nrf/boards/nrf5340dk/board.mk
index 9a973150d..972168fcd 100644
--- a/hw/bsp/nrf/boards/pca10095/board.mk
+++ b/hw/bsp/nrf/boards/nrf5340dk/board.mk
@@ -1,13 +1,9 @@
-MCU_VARIANT = nrf5340_application
+MCU_VARIANT = nrf5340
 CFLAGS += -DNRF5340_XXAA -DNRF5340_XXAA_APPLICATION
 
 # enable max3421 host driver for this board
 MAX3421_HOST = 1
 
-LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf5340_xxaa_application.ld
-
-SRC_C += hw/mcu/nordic/nrfx/drivers/src/nrfx_usbreg.c
-
 # caused by void SystemStoreFICRNS() (without void) in system_nrf5340_application.c
 CFLAGS += -Wno-error=strict-prototypes
 
diff --git a/hw/bsp/nrf/boards/pca10095/ozone/nrf5340.jdebug b/hw/bsp/nrf/boards/nrf5340dk/ozone/nrf5340.jdebug
index 4ad0376a4..4ad0376a4 100644
--- a/hw/bsp/nrf/boards/pca10095/ozone/nrf5340.jdebug
+++ b/hw/bsp/nrf/boards/nrf5340dk/ozone/nrf5340.jdebug
diff --git a/hw/bsp/nrf/boards/nrf54h20dk/board.mk b/hw/bsp/nrf/boards/nrf54h20dk/board.mk
index 157ba3c36..c49b605e8 100644
--- a/hw/bsp/nrf/boards/nrf54h20dk/board.mk
+++ b/hw/bsp/nrf/boards/nrf54h20dk/board.mk
@@ -1,13 +1,9 @@
-MCU_VARIANT = nrf54h20_application
+MCU_VARIANT = nrf54h20
 CFLAGS += -DNRF54H20_XXAA
 
 # enable max3421 host driver for this board
 MAX3421_HOST = 1
 
-LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf5340_xxaa_application.ld
-
-SRC_C += hw/mcu/nordic/nrfx/drivers/src/nrfx_usbreg.c
-
 # caused by void SystemStoreFICRNS() (without void) in system_nrf5340_application.c
 CFLAGS += -Wno-error=strict-prototypes
 
diff --git a/hw/bsp/nrf/boards/pca10056/board.mk b/hw/bsp/nrf/boards/pca10056/board.mk
index be2ed3314..d8bbd41f8 100644
--- a/hw/bsp/nrf/boards/pca10056/board.mk
+++ b/hw/bsp/nrf/boards/pca10056/board.mk
@@ -1,7 +1,5 @@
 MCU_VARIANT = nrf52840
 CFLAGS += -DNRF52840_XXAA
 
-LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52840_xxaa.ld
-
 # flash using jlink
 flash: flash-jlink
diff --git a/hw/bsp/nrf/boards/pca10059/pca10059.ld b/hw/bsp/nrf/boards/pca10059/pca10059.ld
index adc80f3c4..32cc6eada 100644
--- a/hw/bsp/nrf/boards/pca10059/pca10059.ld
+++ b/hw/bsp/nrf/boards/pca10059/pca10059.ld
@@ -11,9 +11,3 @@ MEMORY
 
 
 INCLUDE "nrf_common.ld"
-
-/* nrfx v2 linker does not define __tbss_start/end__ __sbss_start/end__*/
-__tbss_start__ = __tbss_start;
-__tbss_end__ = __tbss_end;
-__sbss_start__ = __sbss_start;
-__sbss_end__ = __sbss_end;
diff --git a/hw/bsp/nrf/boards/pca10095/board.cmake b/hw/bsp/nrf/boards/pca10095/board.cmake
deleted file mode 100644
index a2bfeec89..000000000
--- a/hw/bsp/nrf/boards/pca10095/board.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#set(MCU_VARIANT nrf5340_application)
-set(MCU_VARIANT nrf5340)
-
-function(update_board TARGET)
-  target_sources(${TARGET} PRIVATE
-    ${NRFX_PATH}/drivers/src/nrfx_usbreg.c
-    )
-endfunction()
diff --git a/hw/bsp/nrf/family.cmake b/hw/bsp/nrf/family.cmake
index 67aa19db2..8cebcbedd 100644
--- a/hw/bsp/nrf/family.cmake
+++ b/hw/bsp/nrf/family.cmake
@@ -55,6 +55,7 @@ function(add_board_target BOARD_TARGET)
     target_sources(${BOARD_TARGET} PUBLIC
       ${NRFX_PATH}/mdk/system_${MCU_VARIANT}_application.c
       ${NRFX_PATH}/mdk/gcc_startup_${MCU_VARIANT}_application.S
+      ${NRFX_PATH}/drivers/src/nrfx_usbreg.c
       )
     target_compile_definitions(${BOARD_TARGET} PUBLIC NRF5340_XXAA_APPLICATION)
   else()
diff --git a/hw/bsp/nrf/family.mk b/hw/bsp/nrf/family.mk
index f3a6e2cc1..2cead99db 100644
--- a/hw/bsp/nrf/family.mk
+++ b/hw/bsp/nrf/family.mk
@@ -4,19 +4,37 @@ NRFX_PATH = hw/mcu/nordic/nrfx
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
-# nRF52 is cortex-m4, nRF53 is cortex-m33
-ifeq (${MCU_VARIANT},nrf5340_application)
+ifeq (${MCU_VARIANT},nrf54h20)
 	CPU_CORE = cortex-m33
+	CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_NRF54
+	LD_FILE_DEFAULT = ${FAMILY_PATH}/linker/${MCU_VARIANT}_xxaa_application.ld
+	SRC_C += ${NRFX_PATH}/mdk/system_nrf54h.c
+	SRC_S += ${NRFX_PATH}/mdk/gcc_startup_$(MCU_VARIANT)_application.S
+	JLINK_DEVICE ?= $(MCU_VARIANT)_xxaa_app
+
 else
-ifeq (${MCU_VARIANT},nrf54h20_application)
+ifeq (${MCU_VARIANT},nrf5340)
 	CPU_CORE = cortex-m33
+	CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_NRF5X
+	LD_FILE_DEFAULT = ${FAMILY_PATH}/linker/${MCU_VARIANT}_xxaa_application.ld
+	SRC_C += ${NRFX_PATH}/mdk/system_$(MCU_VARIANT)_application.c \
+					 ${NRFX_PATH}/drivers/src/nrfx_usbreg.c
+	SRC_S += ${NRFX_PATH}/mdk/gcc_startup_$(MCU_VARIANT)_application.S
+  JLINK_DEVICE ?= $(MCU_VARIANT)_xxaa_app
+
 else
+
 	CPU_CORE = cortex-m4
+	CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_NRF5X
+	LD_FILE_DEFAULT = ${FAMILY_PATH}/linker/${MCU_VARIANT}_xxaa.ld
+	SRC_C += ${NRFX_PATH}/mdk/system_$(MCU_VARIANT).c
+	SRC_S += ${NRFX_PATH}/mdk/gcc_startup_$(MCU_VARIANT).S
+	JLINK_DEVICE ?= $(MCU_VARIANT)_xxaa
 endif
 endif
 
 CFLAGS += \
-  -DCFG_TUSB_MCU=OPT_MCU_NRF5X \
+  -DNRF_APPLICATION \
   -DCONFIG_GPIO_AS_PINRESET \
   -D__STARTUP_CLEAR_BSS
 
@@ -41,14 +59,20 @@ LDFLAGS_GCC += \
 LDFLAGS_CLANG += \
   -L$(TOP)/${NRFX_PATH}/mdk \
 
+ifndef LD_FILE
+LD_FILE = ${LD_FILE_DEFAULT}
+endif
+
 SRC_C += \
   src/portable/nordic/nrf5x/dcd_nrf5x.c \
+  src/portable/synopsys/dwc2/dwc2_common.c \
+	src/portable/synopsys/dwc2/dcd_dwc2.c \
+	src/portable/synopsys/dwc2/hcd_dwc2.c \
 	${NRFX_PATH}/helpers/nrfx_flag32_allocator.c \
 	${NRFX_PATH}/drivers/src/nrfx_gpiote.c \
   ${NRFX_PATH}/drivers/src/nrfx_power.c \
   ${NRFX_PATH}/drivers/src/nrfx_spim.c \
   ${NRFX_PATH}/drivers/src/nrfx_uarte.c \
-  ${NRFX_PATH}/mdk/system_$(MCU_VARIANT).c \
   ${NRFX_PATH}/soc/nrfx_atomic.c
 
 INC += \
@@ -61,9 +85,4 @@ INC += \
   $(TOP)/${NRFX_PATH}/drivers/include \
   $(TOP)/${NRFX_PATH}/drivers/src \
 
-SRC_S += ${NRFX_PATH}/mdk/gcc_startup_$(MCU_VARIANT).S
-
 ASFLAGS += -D__HEAP_SIZE=0
-
-# For flash-jlink target
-JLINK_DEVICE ?= $(MCU_VARIANT)_xxaa