From 1386e70d85f58037d5752bbd54ca80f33f562d67 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 19 Oct 2019 15:25:38 -0600
Subject: [PATCH] boards/arm:  Fix/verify to errors found in build testing.

---
 arch/arm/src/s32k1xx/Kconfig                               | 6 ++++--
 boards/arm/dm320/ntosd-dm320/README.txt                    | 2 +-
 boards/arm/dm320/ntosd-dm320/configs/udp/defconfig         | 3 +--
 boards/arm/lpc17xx_40xx/open1788/README.txt                | 7 ++-----
 boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig | 2 --
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/s32k1xx/Kconfig b/arch/arm/src/s32k1xx/Kconfig
index 97d8741d3a..ff480fb959 100644
--- a/arch/arm/src/s32k1xx/Kconfig
+++ b/arch/arm/src/s32k1xx/Kconfig
@@ -247,14 +247,16 @@ config S32K1XX_FLASHCFG_BACKDOOR1
 	default 0xffffffff
 	---help---
 		Refer to the S32K1xx reference manual for a description of the
-		backdoor key.
+		backdoor key.  This option selects the first 32-bit word in
+		memory.
 
 config S32K1XX_FLASHCFG_BACKDOOR2
 	hex "Backdoor comparison key 2"
 	default 0xffffffff
 	---help---
 		Refer to the S32K1xx reference manual for a description of the
-		backdoor key.
+		backdoor key.  This option selects the second 32-bit word in
+		memory
 
 config S32K1XX_FLASHCFG_FPROT
 	hex "Program flash protection bytes"
diff --git a/boards/arm/dm320/ntosd-dm320/README.txt b/boards/arm/dm320/ntosd-dm320/README.txt
index bba18e028a..7a1f993082 100644
--- a/boards/arm/dm320/ntosd-dm320/README.txt
+++ b/boards/arm/dm320/ntosd-dm320/README.txt
@@ -313,7 +313,7 @@ Configuration Sub-Directories
   udp
 
     This alternative configuration directory is similar to nettest
-    except that is use examples/upd to exercise UDP.
+    except that it uses examples/udp to exercise UDP.
 
   webserver
 
diff --git a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
index cbf1002b21..576a8694e8 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
@@ -11,7 +11,6 @@ CONFIG_ARCH_BOARD="ntosd-dm320"
 CONFIG_ARCH_BOARD_NTOSD_DM320=y
 CONFIG_ARCH_CHIP="dm320"
 CONFIG_ARCH_CHIP_DM320=y
-CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y
 CONFIG_BOARD_LOOPSPERMSEC=16945
 CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_DISABLE_ENVIRON=y
@@ -49,5 +48,5 @@ CONFIG_START_YEAR=2008
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_USER_ENTRYPOINT="udp_main"
+CONFIG_USER_ENTRYPOINT="udpclient_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/boards/arm/lpc17xx_40xx/open1788/README.txt b/boards/arm/lpc17xx_40xx/open1788/README.txt
index a6d586bc40..8c2de85614 100644
--- a/boards/arm/lpc17xx_40xx/open1788/README.txt
+++ b/boards/arm/lpc17xx_40xx/open1788/README.txt
@@ -516,11 +516,8 @@ Configuration Directories
 
     NOTES:
 
-    1. Uses the older, OABI, buildroot toolchain.  But that is easily
-       reconfigured:
-
-       CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot toolchain
-       CONFIG_ARMV7M_OABI_TOOLCHAIN=y      : Older, OABI toolchain
+    1. Uses the default toolchain for the selected platform.  But that is
+       easily reconfigured.
 
     2. In this configuration, the SDRAM is not added to heap but is
        dedicated to supporting an LCD frame buffer at address 0xa0010000.
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
index 2bfd5cc78b..741c90f2cf 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
@@ -13,8 +13,6 @@ CONFIG_ARCH_CHIP="lpc17xx_40xx"
 CONFIG_ARCH_CHIP_LPC1788=y
 CONFIG_ARCH_CHIP_LPC17XX_40XX=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7M_OABI_TOOLCHAIN=y
-CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_BCH=y
 CONFIG_BOARD_LOOPSPERMSEC=11934
 CONFIG_BUILTIN=y