rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index ea5a44b..ba1ed0d 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -47,7 +47,7 @@
 
 #define CFG_ATMEL_PLL_INIT_BUG 1
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
-#define CFG_USE_MAIN_OSCILLATOR                1
+#define CFG_USE_MAIN_OSCILLATOR        1
 /* flash */
 #define MC_PUIA_VAL    0x00000000
 #define MC_PUP_VAL     0x00000000
@@ -55,7 +55,7 @@
 #define MC_ASR_VAL     0x00000000
 #define MC_AASR_VAL    0x00000000
 #define EBI_CFGR_VAL   0x00000000
-#define SMC2_CSR_VAL   0x00003084 /* 16bit, 2 TDF, 4 WS */
+#define SMC_CSR0_VAL   0x00003084 /* 16bit, 2 TDF, 4 WS */
 
 /* clocks */
 #define PLLAR_VAL      0x20263E04 /* 180 MHz for PCK */
@@ -81,7 +81,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE                115200
@@ -199,10 +199,10 @@
 #define CFG_FLASH_UNLOCK_TOUT          (10*CFG_HZ)     /* Timeout for Flash Clear Lock Bits */
 #define CFG_FLASH_PROTECTION                           /* "Real" (hardware) sectors protection */
 
-#define CFG_ENV_IS_IN_FLASH            1
-#define CFG_ENV_OFFSET                 0x20000         /* after u-boot.bin */
-#define CFG_ENV_ADDR                   (CFG_FLASH_BASE+CFG_ENV_OFFSET)
-#define CFG_ENV_SIZE                   0x20000
+#define CONFIG_ENV_IS_IN_FLASH         1
+#define CONFIG_ENV_OFFSET                      0x20000         /* after u-boot.bin */
+#define CONFIG_ENV_ADDR                        (CFG_FLASH_BASE+CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_SIZE                        0x20000
 
 #define CFG_LOAD_ADDR          0x21000000  /* default load address */
 
@@ -216,25 +216,6 @@
 #define CFG_DEVICE_DEREGISTER           /* needs device_deregister */
 #define LITTLEENDIAN            1       /* used by usb_ohci.c  */
 
-#ifndef __ASSEMBLY__
-/*-----------------------------------------------------------------------
- * Board specific extension for bd_info
- *
- * This structure is embedded in the global bd_info (bd_t) structure
- * and can be used by the board specific code (eg board/...)
- */
-
-struct bd_info_ext {
-       /* helper variable for board environment handling
-        *
-        * env_crc_valid == 0    =>   uninitialised
-        * env_crc_valid  > 0    =>   environment crc in flash is valid
-        * env_crc_valid  < 0    =>   environment crc in flash is invalid
-        */
-       int env_crc_valid;
-};
-#endif /* __ASSEMBLY__ */
-
 #define CFG_HZ 1000
 #define CFG_HZ_CLOCK (AT91C_MASTER_CLOCK/2)    /* AT91C_TC0_CMR is implicitly set to */
                                                /* AT91C_TC_TIMER_DIV1_CLOCK */
@@ -249,7 +230,8 @@ struct bd_info_ext {
 #undef CONFIG_SILENT_CONSOLE           /* enable silent startup        */
 
 #define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_PROMPT \
+       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
 #define CONFIG_AUTOBOOT_STOP_STR " "
 #define CONFIG_AUTOBOOT_DELAY_STR "d"