Merge branch 'master' of git://git.denx.de/u-boot-avr32

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

diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index 22a972f..a7319e4 100644 (file)
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -24,22 +24,22 @@
 #include "../board/xilinx/ml507/xparameters.h"
 
 /*Mem Map*/
-#define CFG_SDRAM_SIZE_MB      256
+#define CONFIG_SYS_SDRAM_SIZE_MB       256
 
 /*Env*/
 #define        CONFIG_ENV_IS_IN_FLASH  1
 #define        CONFIG_ENV_SIZE         0x20000
 #define        CONFIG_ENV_SECT_SIZE    0x20000
-#define CONFIG_ENV_OFFSET              0x340000
+#define CONFIG_ENV_OFFSET      0x340000
 #define CONFIG_ENV_ADDR                (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET)
 
 /*Misc*/
-#define CFG_PROMPT             "ml507:/# "     /* Monitor Command Prompt    */
+#define CONFIG_SYS_PROMPT      "ml507:/# "     /* Monitor Command Prompt    */
 #define CONFIG_PREBOOT         "echo U-Boot is up and runnining;"
 
 /*Flash*/
-#define        CFG_FLASH_SIZE          (32*1024*1024)
-#define        CFG_MAX_FLASH_SECT      259
+#define        CONFIG_SYS_FLASH_SIZE   (32*1024*1024)
+#define        CONFIG_SYS_MAX_FLASH_SECT       259
 #define MTDIDS_DEFAULT         "nor0=ml507-flash"
 #define MTDPARTS_DEFAULT       "mtdparts=ml507-flash:-(user)"