Merge pull request zephyrproject-rtos#3 from grandcat/board-nfct-pins

boards: tado_ru02xx: fix NFCT config and flash page API
locomuco · Dec 8, 2017 · a630040 · a630040
2 parents 36ebf06 + bc66d29
commit a630040
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/boards/arm/tado_ru02xx/Kconfig b/boards/arm/tado_ru02xx/Kconfig
@@ -10,4 +10,8 @@ config  GPIO_AS_PINRESET
 	bool "GPIO as pin reset (reset button)"
 	default y
 
+config NFCT_PINS_AS_GPIOS
+	bool "NFCT pins as GPIO"
+	default y
+
 endif # BOARD_TADO_RU02XX
diff --git a/boards/arm/tado_ru02xx/Kconfig.defconfig b/boards/arm/tado_ru02xx/Kconfig.defconfig
@@ -9,6 +9,16 @@ if BOARD_TADO_RU02XX
 config BOARD
 	default tado_ru02xx
 
+if SOC_FLASH_NRF5 
+
+# Avoid MCUB-90 bug on nRF5x targets:
+# mcuboot cannot detect default flash page size without this API and fallbacks
+# to strange defaults/hacks. 
+config FLASH_PAGE_LAYOUT
+	default y
+
+endif # SOC_FLASH_NRF5
+
 if GPIO_NRF5
 
 config GPIO_NRF5_P0

diff --git a/boards/arm/tado_ru02xx/board.h b/boards/arm/tado_ru02xx/board.h
@@ -9,6 +9,10 @@
 
 #include <soc.h>
 
+/* GUI Button */
+#define GPIO_GUI_BUTTON_PIN 	5
+#define GPIO_GUI_BUTTON_NAME	CONFIG_GPIO_NRF5_P0_DEV_NAME
+
 /* Push button switch 0 */
 #define SW0_GPIO_PIN	13
 #define SW0_GPIO_NAME	CONFIG_GPIO_NRF5_P0_DEV_NAME

diff --git a/boards/arm/tado_ru02xx/tado_ru02xx.dts b/boards/arm/tado_ru02xx/tado_ru02xx.dts
@@ -54,8 +54,7 @@
 		};
 		scratch_partition: partition@70000 {
 			label = "image-scratch";
-			reg = <0x00070000 0x1000>; 
-			// reg = <0x00070000 0xC800>; // causes problems for mcuboot
+			reg = <0x00070000 0xd000>;
 		};
 
 		/*

diff --git a/boards/arm/tado_ru02xx/tado_ru02xx_defconfig b/boards/arm/tado_ru02xx/tado_ru02xx_defconfig
@@ -7,9 +7,10 @@ CONFIG_BOARD_TADO_RU02XX=y
 # Enable MPU
 CONFIG_ARM_MPU_NRF52X=y
 
+# Enable generic Serial driver necessary for SPI
+CONFIG_SERIAL=y
 # Do not use UART driver by default for stdout
-# CONFIG_SERIAL is not set
-# CONFIG_UART_NRF5 is not set
+# CONFIG_UART_CONSOLE is not set
 
 # Enable console and use RTT by default for log output
 CONFIG_CONSOLE=y
@@ -19,6 +20,7 @@ CONFIG_RTT_CONSOLE=y
 
 # Additional board options
 CONFIG_GPIO_AS_PINRESET=y
+CONFIG_NFCT_PINS_AS_GPIOS=y
 
 # Bluetooth
 CONFIG_BT=n