Repairs needed after Kconfig changes for LPC31

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5105 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 16 insertions, 16 deletions

diff --git a/nuttx/configs/ea3152/src/Makefile b/nuttx/configs/ea3152/src/Makefile
index 6393f3091..91a7fe379 100644
--- a/nuttx/configs/ea3152/src/Makefile
+++ b/nuttx/configs/ea3152/src/Makefile
@@ -44,13 +44,13 @@ CSRCS		= up_boot.c up_clkinit.c
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS		+= up_buttons.c
 endif
-ifeq ($(CONFIG_LPC31XX_EXTSDRAM),y)
+ifeq ($(CONFIG_LPC31_EXTSDRAM),y)
 CSRCS		+= up_mem.c
 endif
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS		+= up_leds.c
 endif
-ifeq ($(CONFIG_LPC31XX_SPI),y)
+ifeq ($(CONFIG_LPC31_SPI),y)
 CSRCS		+= up_spi.c
 endif
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
diff --git a/nuttx/configs/ea3152/src/ea3152_internal.h b/nuttx/configs/ea3152/src/ea3152_internal.h
index 94a6e5a23..ee93c36a1 100644
--- a/nuttx/configs/ea3152/src/ea3152_internal.h
+++ b/nuttx/configs/ea3152/src/ea3152_internal.h
@@ -86,7 +86,7 @@
  *
  ************************************************************************************/
 
-#ifdef CONFIG_LPC31XX_EXTSDRAM
+#ifdef CONFIG_LPC31_EXTSDRAM
 extern void lpc31_meminitialize(void);
 #endif
 
diff --git a/nuttx/configs/ea3152/src/up_boot.c b/nuttx/configs/ea3152/src/up_boot.c
index e85cb5125..c8870cfdf 100644
--- a/nuttx/configs/ea3152/src/up_boot.c
+++ b/nuttx/configs/ea3152/src/up_boot.c
@@ -75,7 +75,7 @@ void lpc31_boardinitialize(void)
 {
   /* Initialize configured, external memory resources */
 
-#ifdef CONFIG_LPC31XX_EXTSDRAM
+#ifdef CONFIG_LPC31_EXTSDRAM
   lpc31_meminitialize();
 #endif
 
@@ -83,7 +83,7 @@ void lpc31_boardinitialize(void)
    * lpc31_spiinitialize() has been brought into the link.
    */
 
-#if defined(CONFIG_LPC31XX_SPI)
+#if defined(CONFIG_LPC31_SPI)
   if (lpc31_spiinitialize)
     {
       lpc31_spiinitialize();
@@ -95,7 +95,7 @@ void lpc31_boardinitialize(void)
     * into the build.
     */
 
-#if defined(CONFIG_USBDEV) && defined(CONFIG_LPC31XX_USB)
+#if defined(CONFIG_USBDEV) && defined(CONFIG_LPC31_USB)
   if (lpc31_usbinitialize)
     {
       lpc31_usbinitialize();
diff --git a/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c
index 019dd940c..880f70036 100644
--- a/nuttx/configs/ea3152/src/up_fillpage.c
+++ b/nuttx/configs/ea3152/src/up_fillpage.c
@@ -122,7 +122,7 @@
     * is not enabled.
     */
 
-#  if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31XX_MCI)
+#  if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31_MCI)
 #    ifdef CONFIG_PAGING_SDSLOT
 #      error "Mountpoints and/or MCI disabled"
 #    endif
@@ -152,7 +152,7 @@
 
    /* Verify that SPI support is enabld */
 
-#ifndef CONFIG_LPC31XX_SPI
+#ifndef CONFIG_LPC31_SPI
 #  error "SPI support is not enabled"
 #endif
 
diff --git a/nuttx/configs/ea3152/src/up_mem.c b/nuttx/configs/ea3152/src/up_mem.c
index 5eae04e0f..4f6c71e87 100644
--- a/nuttx/configs/ea3152/src/up_mem.c
+++ b/nuttx/configs/ea3152/src/up_mem.c
@@ -59,7 +59,7 @@
 #include "lpc31_mpmc.h"
 #include "ea3152_internal.h"
 
-#ifdef CONFIG_LPC31XX_EXTSDRAM
+#ifdef CONFIG_LPC31_EXTSDRAM
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -164,8 +164,8 @@ static void lpc31_sdraminitialize(void)
    * replaced with an apriori value.
    */
 
-#ifdef CONFIG_LPC31XX_SDRAMHCLK
-# define HCLK CONFIG_LPC31XX_SDRAMHCLK
+#ifdef CONFIG_LPC31_SDRAMHCLK
+# define HCLK CONFIG_LPC31_SDRAMHCLK
 #else
   uint32_t hclk = lpc31_clkfreq(CLKID_MPMCCFGCLK2, DOMAINID_SYS);
 # define HCLK hclk
@@ -356,4 +356,4 @@ void lpc31_meminitialize(void)
 
   lpc31_sdraminitialize();
 }
-#endif /* CONFIG_LPC31XX_EXTSDRAM */
+#endif /* CONFIG_LPC31_EXTSDRAM */
diff --git a/nuttx/configs/ea3152/src/up_nsh.c b/nuttx/configs/ea3152/src/up_nsh.c
index ab8f779f0..ddd0e9195 100644
--- a/nuttx/configs/ea3152/src/up_nsh.c
+++ b/nuttx/configs/ea3152/src/up_nsh.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#ifdef CONFIG_LPC31XX_MCI
+#ifdef CONFIG_LPC31_MCI
 #  include <nuttx/sdio.h>
 #  include <nuttx/mmcsd.h>
 #endif
@@ -88,7 +88,7 @@
  * is not enabled.
  */
 
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31XX_MCI)
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31_MCI)
 #  undef CONFIG_NSH_HAVEMMCSD
 #endif
 
diff --git a/nuttx/configs/ea3152/src/up_spi.c b/nuttx/configs/ea3152/src/up_spi.c
index 7f399d9dc..2dd7b1e23 100644
--- a/nuttx/configs/ea3152/src/up_spi.c
+++ b/nuttx/configs/ea3152/src/up_spi.c
@@ -52,7 +52,7 @@
 #include "lpc31_internal.h"
 #include "ea3152_internal.h"
 
-#ifdef CONFIG_LPC31XX_SPI
+#ifdef CONFIG_LPC31_SPI
 #if 0 /* At present, EA3152 specific logic is hard-coded in the file lpc31_spi.c
        * in arch/arm/src/lpc31xx */
 
@@ -138,5 +138,5 @@ uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 }
 
 #endif /* 0 */
-#endif /* CONFIG_LPC31XX_SPI  */
+#endif /* CONFIG_LPC31_SPI  */