From 811143053073fa822cdf63ded246299026bcf99c Mon Sep 17 00:00:00 2001
From: raiden00pl <raiden00@railab.me>
Date: Sat, 8 Jul 2023 12:28:32 +0200
Subject: [PATCH] nrf9160-dk add secure miniboot configuration that jumpt to
 non-secure code

---
 .../arm/nrf91/boards/nrf9160-dk/index.rst     |  9 ++++
 .../nrf9160-dk/configs/miniboot_s/defconfig   | 54 +++++++++++++++++++
 boards/arm/nrf91/nrf9160-dk/include/board.h   |  8 +++
 3 files changed, 71 insertions(+)
 create mode 100644 boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig

diff --git a/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst b/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst
index fc90eea6c8..dc32ad5a10 100644
--- a/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst
+++ b/Documentation/platforms/arm/nrf91/boards/nrf9160-dk/index.rst
@@ -17,6 +17,15 @@ P0.28 APP UART0 TX virtual COM 0
 P0.29 APP UART0 RX virtual COM 0
 ===== ============ =============
 
+Serial console for the MCUBOOT (secure domain):
+
+===== ============ =============
+Pin   Signal       Notes
+===== ============ =============
+P0.00 APP UART1 TX virtual COM 2
+P0.01 APP UART1 RX virtual COM 2
+===== ============ =============
+
 LEDs and Buttons
 ================
 
diff --git a/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig
new file mode 100644
index 0000000000..87806b966e
--- /dev/null
+++ b/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig
@@ -0,0 +1,54 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_STANDARD_SERIAL is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="nrf9160-dk"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_NRF9160_DK=y
+CONFIG_ARCH_CHIP="nrf91"
+CONFIG_ARCH_CHIP_NRF9160=y
+CONFIG_ARCH_CHIP_NRF91=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_STDARG_H=y
+CONFIG_ARMV8M_CMSE=y
+CONFIG_BOARDCTL=y
+CONFIG_BOARD_LOOPSPERMSEC=5500
+CONFIG_BOOT_MINIBOOT=y
+CONFIG_DEBUG_BUSFAULT=y
+CONFIG_DEBUG_FULLOPT=y
+CONFIG_DEBUG_SECUREFAULT=y
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_USAGEFAULT=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENTRYPOINT="miniboot_main"
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MM_REGIONS=2
+CONFIG_NRF91_APP_FORMAT_MCUBOOT=y
+CONFIG_NRF91_FLASH_NS_START=2
+CONFIG_NRF91_GPIO0_NS=y
+CONFIG_NRF91_IPC_NS=y
+CONFIG_NRF91_NONSECURE_BOOT=y
+CONFIG_NRF91_NVMC_NS=y
+CONFIG_NRF91_POWERCLOCK_NS=y
+CONFIG_NRF91_PROGMEM_OTA_PARTITION=y
+CONFIG_NRF91_RAM_NS_START=4
+CONFIG_NRF91_REGULATORS_NS=y
+CONFIG_NRF91_SERIAL0_NS=y
+CONFIG_NRF91_SPU_NONSECURE=y
+CONFIG_NRF91_UART1=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=65536
+CONFIG_RAM_START=0x20000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_WAITPID=y
+CONFIG_START_DAY=26
+CONFIG_START_MONTH=3
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_UART1_SERIAL_CONSOLE=y
diff --git a/boards/arm/nrf91/nrf9160-dk/include/board.h b/boards/arm/nrf91/nrf9160-dk/include/board.h
index fcd76867a4..63a8901e81 100644
--- a/boards/arm/nrf91/nrf9160-dk/include/board.h
+++ b/boards/arm/nrf91/nrf9160-dk/include/board.h
@@ -103,4 +103,12 @@
 #define BOARD_UART0_RX_PIN  (GPIO_INPUT  | GPIO_PORT0 | GPIO_PIN(28))
 #define BOARD_UART0_TX_PIN  (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN(29))
 
+/* UART1 is connected to the virtual COM port:
+ *   UART1_RX - P0-00
+ *   UART1_TX - P0-01
+ */
+
+#define BOARD_UART1_RX_PIN  (GPIO_INPUT  | GPIO_PORT0 | GPIO_PIN(0))
+#define BOARD_UART1_TX_PIN  (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN(1))
+
 #endif /* __BOARDS_ARM_NRF91_NRF9160_DK_INCLUDE_BOARD_H */