More LPC43xx logic

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4906 7fd9a85b-ad96-42d3-883c-3090e2eb8679

4 files changed, 57 insertions, 20 deletions

diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index 86e3f2f9f..d1fcd7fb9 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -12,7 +12,7 @@ Contents
   - GNU Toolchain Options
   - IDEs
   - NuttX buildroot Toolchain
-  - USB Device Controller Functions
+  - Serial Console
   - FPU
   - LPC4330-Xplorer Configuration Options
   - USB Host Configuration
@@ -234,6 +234,22 @@ NuttX buildroot Toolchain
 
   NOTE: This is an OABI toolchain.
 
+Serial Console
+==============
+
+The LPC4330 Xplorer does not have RS-232 drivers or serial connectors on board.
+USART0 and UART1 are available on J8 as follows:
+
+  ------ ------ -----------------------
+  SIGNAL J8 PIN   LPC4330FET100 PIN
+                  (TFBGA100 package)
+  ------ ------ -----------------------
+  U0_TXD pin  9  F6  P6_4  U0_TXD=Alt 2
+  U0_RXD pin 10  F9  P6_5  U0_RXD=Alt 2
+  U1_TXD pin 13  H8  P1_13 U1_TXD=Alt 1
+  U1_RXD pin 14  J8  P1_14 U1_RXD=Alt 1
+  ------ ------ -----------------------
+
 FPU
 ===
 
diff --git a/nuttx/configs/lpc4330-xplorer/include/board.h b/nuttx/configs/lpc4330-xplorer/include/board.h
index a8b926bfd..6a3f36158 100644
--- a/nuttx/configs/lpc4330-xplorer/include/board.h
+++ b/nuttx/configs/lpc4330-xplorer/include/board.h
@@ -170,26 +170,30 @@
 #define LED_ASSERTION              2  /* NC     ON      NC     OFF */
 #define LED_PANIC                  2  /* NC     ON      NC     OFF */
 
-/* After the system is booted, this logic will no longer use LEDs 1 & 2.
- * They are available for use the application software using lpc43_led
- * (prototyped below)
+/* UART Pins ****************************************************************/
+/* The LPC4330 Xplorer does not have RS-232 drivers or serial connectors on
+ * board. USART0 and UART1 are available on J8 as follows:
+ *
+ *   ------ ------ -----------------------
+ *   SIGNAL J8 PIN   LPC4330FET100 PIN
+ *                   (TFBGA100 package)
+ *   ------ ------ -----------------------
+ *   U0_TXD pin  9  F6  P6_4  U0_TXD=Alt 2
+ *   U0_RXD pin 10  F9  P6_5  U0_RXD=Alt 2
+ *   U1_TXD pin 13  H8  P1_13 U1_TXD=Alt 1
+ *   U1_RXD pin 14  J8  P1_14 U1_RXD=Alt 1
+ *   ------ ------ -----------------------
+ *
+ * The following definitions must be provided so that the LPC43 serial
+ * driver can set up the U[S]ART for the serial console properly (see the
+ * file arch/arc/src/lpc43xx/lpc4310203050_pinconf.h for more info).
  */
 
-#define GPIO_SSP0_SCK              GPIO_SSP0_SCK_1
-#define GPIO_SSP0_SSEL             GPIO_SSP0_SSEL_1
-#define GPIO_SSP0_MISO             GPIO_SSP0_MISO_1
-#define GPIO_SSP0_MOSI             GPIO_SSP0_MOSI_1
+#define PINCONF_U0_TXD  PINCONF_U0_TXD_3
+#define PINCONF_U0_RXD  PINCONF_U0_RXD_3
 
-/* We need to redefine USB_PWRD as GPIO to get USB Host working
- * Also remember to add 2 resistors of 15K to D+ and D- pins.
- */
-
-#ifdef CONFIG_USBHOST
-#  ifdef GPIO_USB_PWRD
-#    undef  GPIO_USB_PWRD
-#    define GPIO_USB_PWRD    (GPIO_INPUT | GPIO_PORT1 | GPIO_PIN22)
-#  endif
-#endif
+#define PINCONF_U1_TXD  PINCONF_U1_TXD_1
+#define PINCONF_U1_RXD  PINCONF_U1_RXD_1
 
 /****************************************************************************
  * Public Types
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
index 782a4931e..6d6bd7b67 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
@@ -82,8 +82,8 @@ CONFIG_ARCH_CHIP_LPC4330FET100=y
 CONFIG_ARCH_BOARD=lpc4330-xplorer
 CONFIG_ARCH_BOARD_LPC4330_XPLORER=y
 CONFIG_BOARD_LOOPSPERMSEC=7982
-CONFIG_DRAM_SIZE=(128*1024)
-CONFIG_DRAM_START=0x10000000
+CONFIG_DRAM_SIZE=(72*1024)
+CONFIG_DRAM_START=0x10080000
 CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_FPU=n
@@ -94,6 +94,7 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=n
+CONFIG_ARMV7M_CMNVECTOR=y
 
 #
 # Identify toolchain and linker options
diff --git a/nuttx/configs/lpc4330-xplorer/src/xplorer_internal.h b/nuttx/configs/lpc4330-xplorer/src/xplorer_internal.h
index 45c972a75..886382c65 100644
--- a/nuttx/configs/lpc4330-xplorer/src/xplorer_internal.h
+++ b/nuttx/configs/lpc4330-xplorer/src/xplorer_internal.h
@@ -85,6 +85,22 @@
 
 #define LPC4330_XPLORER_BUT1_IRQ  LPC43_IRQ_P0p23
 
+#define GPIO_SSP0_SCK  GPIO_SSP0_SCK_1
+#define GPIO_SSP0_SSEL GPIO_SSP0_SSEL_1
+#define GPIO_SSP0_MISO GPIO_SSP0_MISO_1
+#define GPIO_SSP0_MOSI GPIO_SSP0_MOSI_1
+
+/* We need to redefine USB_PWRD as GPIO to get USB Host working
+ * Also remember to add 2 resistors of 15K to D+ and D- pins.
+ */
+
+#ifdef CONFIG_USBHOST
+#  ifdef GPIO_USB_PWRD
+#    undef  GPIO_USB_PWRD
+#    define GPIO_USB_PWRD  (GPIO_INPUT | GPIO_PORT1 | GPIO_PIN22)
+#  endif
+#endif
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/