get cmake build with 54h20 not tested on actual hw, probably not running

Author: hathach

hw/bsp/nrf/boards/pca10100/board.cmake renamed to hw/bsp/nrf/boards/nrf52833dk/board.cmake

@@ -0,0 +1,11 @@
+set(MCU_VARIANT nrf54h20)
+
+function(update_board TARGET)
+  # temporarily, 54h20 has multiple sram sections
+  target_compile_definitions(${TARGET} PUBLIC
+    CFG_EXAMPLE_VIDEO_READONLY
+    )
+  target_sources(${TARGET} PRIVATE
+#    ${NRFX_PATH}/drivers/src/nrfx_usbreg.c
+    )
+endfunction()

hw/bsp/nrf/boards/pca10100/board.h renamed to hw/bsp/nrf/boards/nrf52833dk/board.h

@@ -0,0 +1,65 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020, Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+/* metadata:
+   name: Nordic nRF5340 DK
+   url: https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF5340-DK
+*/
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#define _PINNUM(port, pin)    ((port)*32 + (pin))
+
+// LED
+#define LED_PIN               28
+#define LED_STATE_ON          0
+
+// Button
+#define BUTTON_PIN            23
+#define BUTTON_STATE_ACTIVE   0
+
+// UART
+#define UART_RX_PIN           22
+#define UART_TX_PIN           20
+
+// SPI for USB host shield
+// Pin is correct but not working probably due to signal incompatible (1.8V 3v3) with MAC3421E !?
+//#define MAX3421_SCK_PIN  _PINNUM(1, 15)
+//#define MAX3421_MOSI_PIN _PINNUM(1, 13)
+//#define MAX3421_MISO_PIN _PINNUM(1, 14)
+//#define MAX3421_CS_PIN   _PINNUM(1, 12)
+//#define MAX3421_INTR_PIN _PINNUM(1, 11)
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* BOARD_H_ */

hw/bsp/nrf/boards/pca10100/board.mk renamed to hw/bsp/nrf/boards/nrf52833dk/board.mk

@@ -0,0 +1,16 @@
+MCU_VARIANT = nrf54h20_application
+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
+
+# flash using jlink
+JLINK_DEVICE = nrf5340_xxaa_app
+flash: flash-jlink

hw/bsp/nrf/boards/nrf54h20dk/board.cmake

@@ -1,4 +1,5 @@
-set(MCU_VARIANT nrf5340_application)
+#set(MCU_VARIANT nrf5340_application)
+set(MCU_VARIANT nrf5340)
 
 function(update_board TARGET)
   target_sources(${TARGET} PRIVATE

hw/bsp/nrf/boards/nrf54h20dk/board.h

@@ -1,4 +1,3 @@
-CPU_CORE = cortex-m33
 MCU_VARIANT = nrf5340_application
 CFLAGS += -DNRF5340_XXAA -DNRF5340_XXAA_APPLICATION
 

hw/bsp/nrf/boards/nrf54h20dk/board.mk

@@ -45,7 +45,9 @@
 #include "nrfx.h"
 #include "hal/nrf_gpio.h"
 #include "nrfx_gpiote.h"
+#if !defined(NRF54H20_XXAA)
 #include "nrfx_power.h"
+#endif
 #include "nrfx_uarte.h"
 #include "nrfx_spim.h"
 
@@ -58,21 +60,26 @@
 #pragma GCC diagnostic pop
 #endif
 
-
-// There is API changes between nrfx v2 and v3
-#if 85301 >= (10000*MDK_MAJOR_VERSION + 100*MDK_MINOR_VERSION + MDK_MICRO_VERSION)
-  // note MDK 8.53.1 is also used by nrfx v3.0.0, just skip this version and use later 3.x
-  #define NRFX_VER 2
-#else
-  #define NRFX_VER 3
+// example only supports nrfx v3 for code simplicity
+#if !(defined(NRFX_CONFIG_API_VER_MAJOR) && NRFX_CONFIG_API_VER_MAJOR >= 3) && \
+    !(85301 >= (10000*MDK_MAJOR_VERSION + 100*MDK_MINOR_VERSION + MDK_MICRO_VERSION))
+  #error "Example requires nrfx v3.0.0 or later"
 #endif
 
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
 //--------------------------------------------------------------------+
+#if defined(NRF54H20_XXAA)
+#define USBD_IRQn  USBHS_IRQn
+void USBHS_IRQHandler(void) {
+  tusb_int_handler(0, true);
+}
+
+#else
 void USBD_IRQHandler(void) {
   tud_int_handler(0);
 }
+#endif
 
 /*------------------------------------------------------------------*/
 /* MACRO TYPEDEF CONSTANT ENUM
@@ -96,39 +103,39 @@ enum {
   #define OUTPUTRDY_Msk POWER_USBREGSTATUS_OUTPUTRDY_Msk
 #endif
 
-static nrfx_uarte_t _uart_id = NRFX_UARTE_INSTANCE(0);
+static nrfx_uarte_t _uart_id = NRFX_UARTE_INSTANCE(CFG_NRFX_UARTE_INSTANCE_ID);
 
 // tinyusb function that handles power event (detected, ready, removed)
 // We must call it within SD's SOC event handler, or set it as power event handler if SD is not enabled.
 extern void tusb_hal_nrf_power_event(uint32_t event);
 
+#if !defined(NRF54H20_XXAA)
 // nrf power callback, could be unused if SD is enabled or usb is disabled (board_test example)
 TU_ATTR_UNUSED static void power_event_handler(nrfx_power_usb_evt_t event) {
   tusb_hal_nrf_power_event((uint32_t) event);
 }
+#endif
 
 //------------- Host using MAX2341E -------------//
 #if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
 static void max3421_init(void);
 static nrfx_spim_t _spi = NRFX_SPIM_INSTANCE(1);
-
-#if NRFX_VER > 2
 static nrfx_gpiote_t _gpiote = NRFX_GPIOTE_INSTANCE(0);
 #endif
 
-#endif
-
 //--------------------------------------------------------------------+
 //
 //--------------------------------------------------------------------+
 
 void board_init(void) {
+#if !defined(NRF54H20_XXAA)
   // stop LF clock just in case we jump from application without reset
   NRF_CLOCK->TASKS_LFCLKSTOP = 1UL;
 
   // Use Internal OSC to compatible with all boards
   NRF_CLOCK->LFCLKSRC = LFCLK_SRC_RC;
   NRF_CLOCK->TASKS_LFCLKSTART = 1UL;
+#endif
 
   // LED
   nrf_gpio_cfg_output(LED_PIN);
@@ -140,6 +147,7 @@ void board_init(void) {
 #if CFG_TUSB_OS == OPT_OS_NONE
   // 1ms tick timer
   SysTick_Config(SystemCoreClock / 1000);
+
 #elif CFG_TUSB_OS == OPT_OS_ZEPHYR
   #ifdef CONFIG_HAS_HW_NRF_USBREG
   // IRQ_CONNECT(USBREGULATOR_IRQn, DT_IRQ(DT_INST(0, nordic_nrf_clock), priority), nrfx_isr, nrfx_usbreg_irq_handler, 0);
@@ -153,21 +161,6 @@ void board_init(void) {
 #endif
 
   // UART
-  #if NRFX_VER <= 2
-  nrfx_uarte_config_t uart_cfg = {
-      .pseltxd   = UART_TX_PIN,
-      .pselrxd   = UART_RX_PIN,
-      .pselcts   = NRF_UARTE_PSEL_DISCONNECTED,
-      .pselrts   = NRF_UARTE_PSEL_DISCONNECTED,
-      .p_context = NULL,
-      .baudrate  = NRF_UARTE_BAUDRATE_115200, // CFG_BOARD_UART_BAUDRATE
-      .interrupt_priority = 7,
-      .hal_cfg = {
-          .hwfc      = NRF_UARTE_HWFC_DISABLED,
-          .parity    = NRF_UARTE_PARITY_EXCLUDED,
-      }
-  };
-  #else
   nrfx_uarte_config_t uart_cfg = {
       .txd_pin   = UART_TX_PIN,
       .rxd_pin   = UART_RX_PIN,
@@ -181,7 +174,6 @@ void board_init(void) {
           .parity    = NRF_UARTE_PARITY_EXCLUDED,
       }
   };
-  #endif
 
   nrfx_uarte_init(&_uart_id, &uart_cfg, NULL);
 
@@ -191,6 +183,7 @@ void board_init(void) {
   // 2 is highest for application
   NVIC_SetPriority(USBD_IRQn, 2);
 
+#if !defined(NRF54H20_XXAA)
   // USB power may already be ready at this time -> no event generated
   // We need to invoke the handler based on the status initially
   uint32_t usb_reg;
@@ -234,6 +227,7 @@ void board_init(void) {
     tusb_hal_nrf_power_event(USB_EVT_READY);
   }
 #endif
+#endif
 
 #if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
   max3421_init();
@@ -255,7 +249,9 @@ uint32_t board_button_read(void) {
 size_t board_get_unique_id(uint8_t id[], size_t max_len) {
   (void) max_len;
 
-#ifdef NRF5340_XXAA
+#if defined(NRF54H20_XXAA)
+  uintptr_t did_addr = (uintptr_t) NRF_FICR->BLE.ADDR;
+#elif defined(NRF5340_XXAA)
   uintptr_t did_addr = (uintptr_t) NRF_FICR->INFO.DEVICEID;
 #else
   uintptr_t did_addr = (uintptr_t) NRF_FICR->DEVICEID;
@@ -277,11 +273,7 @@ int board_uart_read(uint8_t* buf, int len) {
 }
 
 int board_uart_write(void const* buf, int len) {
-  nrfx_err_t err = nrfx_uarte_tx(&_uart_id, (uint8_t const*) buf, (size_t) len
-                                 #if NRFX_VER > 2
-                                 ,0
-                                 #endif
-                                );
+  nrfx_err_t err = nrfx_uarte_tx(&_uart_id, (uint8_t const*) buf, (size_t) len ,0);
   return (NRFX_SUCCESS == err) ? len : 0;
 }
 
@@ -352,18 +344,16 @@ void nrf_error_cb(uint32_t id, uint32_t pc, uint32_t info) {
 // API: SPI transfer with MAX3421E, must be implemented by application
 //--------------------------------------------------------------------+
 #if CFG_TUH_ENABLED && defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
-
-#if NRFX_VER <= 2
-void max3421_int_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action ) {
-  if (action != NRF_GPIOTE_POLARITY_HITOLO) return;
-#else
 void max3421_int_handler(nrfx_gpiote_pin_t pin, nrfx_gpiote_trigger_t action, void* p_context) {
   (void) p_context;
-  if (action != NRFX_GPIOTE_TRIGGER_HITOLO) return;
-#endif
+  if (action != NRFX_GPIOTE_TRIGGER_HITOLO) {
+    return;
+  }
+  if (pin != MAX3421_INTR_PIN) {
+    return;
+  }
 
-  if (pin != MAX3421_INTR_PIN) return;
-  tuh_int_handler(1, true);
+  tusb_int_handler(1, true);
 }
 
 static void max3421_init(void) {
@@ -378,13 +368,8 @@ static void max3421_init(void) {
       .sck_pin        = MAX3421_SCK_PIN,
       .mosi_pin       = MAX3421_MOSI_PIN,
       .miso_pin       = MAX3421_MISO_PIN,
-  #if NRFX_VER <= 2
-      .ss_pin         = NRFX_SPIM_PIN_NOT_USED,
-      .frequency      = NRF_SPIM_FREQ_4M,
-  #else
       .ss_pin         = NRF_SPIM_PIN_NOT_CONNECTED,
       .frequency      = 4000000u,
-  #endif
       .ss_active_high = false,
       .irq_priority   = 3,
       .orc            = 0xFF,
@@ -398,14 +383,6 @@ static void max3421_init(void) {
   TU_ASSERT(NRFX_SUCCESS == nrfx_spim_init(&_spi, &cfg, NULL, NULL), );
 
   // max3421e interrupt pin
-  #if NRFX_VER <= 2
-  nrfx_gpiote_init(1);
-  nrfx_gpiote_in_config_t in_config = NRFX_GPIOTE_CONFIG_IN_SENSE_HITOLO(true);
-  in_config.pull = NRF_GPIO_PIN_PULLUP;
-  NVIC_SetPriority(GPIOTE_IRQn, 2);
-  nrfx_gpiote_in_init(MAX3421_INTR_PIN, &in_config, max3421_int_handler);
-  nrfx_gpiote_trigger_enable(MAX3421_INTR_PIN, true);
-  #else
   nrf_gpio_pin_pull_t intr_pull = NRF_GPIO_PIN_PULLUP;
   nrfx_gpiote_trigger_config_t intr_trigger = {
       .trigger = NRFX_GPIOTE_TRIGGER_HITOLO,
@@ -426,7 +403,6 @@ static void max3421_init(void) {
 
   nrfx_gpiote_input_configure(&_gpiote, MAX3421_INTR_PIN, &intr_config);
   nrfx_gpiote_trigger_enable(&_gpiote, MAX3421_INTR_PIN, true);
-  #endif
 }
 
 // API to enable/disable MAX3421 INTR pin interrupt