Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 3ff4b68..02ec239 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -104,14 +104,14 @@
 
 #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
 #define CONFIG_BOOTCOMMAND                                             \
        "bootp;"                                                        \
        "setenv bootargs root=/dev/nfs rw "                             \
-       "nfsroot=${serverip}:${rootpath} "                              \
+       "nfsroot=${serverip}:${rootpath} "                              \
        "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"\
        "bootm"
 
@@ -182,9 +182,9 @@
 
 #define CONFIG_RTC_DS12887
 
-#define RTC_BASE_ADDR          0xF5000000
-#define RTC_PORT_ADDR          RTC_BASE_ADDR + 0x800
-#define RTC_PORT_DATA          RTC_BASE_ADDR + 0x808
+#define RTC_BASE_ADDR          0xF5000000
+#define RTC_PORT_ADDR          RTC_BASE_ADDR + 0x800
+#define RTC_PORT_DATA          RTC_BASE_ADDR + 0x808
 
 #define CONFIG_MISC_INIT_R
 
@@ -270,14 +270,14 @@
 
 #if 1
 /* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH    1
-# define CFG_ENV_ADDR          (CFG_FLASH_BASE+0x30000)
-# define CFG_ENV_SIZE          0x10000
-# define CFG_ENV_SECT_SIZE     0x10000
+#define CONFIG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_ADDR               (CFG_FLASH_BASE+0x30000)
+# define CONFIG_ENV_SIZE               0x10000
+# define CONFIG_ENV_SECT_SIZE  0x10000
 #else
-#define CFG_ENV_IS_IN_EEPROM   1
-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           2048
+#define CONFIG_ENV_IS_IN_EEPROM        1
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                2048
 #define CFG_EEPROM_PAGE_WRITE_BITS     4       /* 16-byte page size    */
 #endif
 /*