avr32: refactor the portmux/gpio code

[platform/kernel/u-boot.git] / include / configs / sc3.h

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 0a03c0e..659f74e 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -97,7 +97,7 @@
 #define CONFIG_BOOTDELAY       3 /* autoboot after 3 seconds         */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -132,7 +132,8 @@
 
 #if 1  /* feel free to disable for development */
 #define CONFIG_AUTOBOOT_KEYED          /* Enable password protection   */
-#define CONFIG_AUTOBOOT_PROMPT         "\nSC3 - booting... stop with ENTER\n"
+#define CONFIG_AUTOBOOT_PROMPT         \
+       "\nSC3 - booting... stop with ENTER\n"
 #define CONFIG_AUTOBOOT_DELAY_STR      "\r"    /* 1st "password"       */
 #define CONFIG_AUTOBOOT_DELAY_STR2     "\n"    /* 1st "password"       */
 #endif
@@ -396,7 +397,7 @@ extern unsigned long offsetOfEnvironment;
 #define CFG_MAX_FLASH_SECT     256     /* max number of sectors on one chip    */
 
 #define CFG_FLASH_CFI                  /* flash is CFI compat. */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver*/
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver*/
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector   */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash*/
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */