Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / configs / mx31ads.h

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index b9ad3e4af5f7feed386a250e3291dfaf41adfbf9..b904d814da75e49d0c1cec8faa0bfeadf68306ab 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -50,7 +50,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 */
 
 /*
@@ -170,19 +170,19 @@
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE  /* Monitor at beginning of flash */
 #define CFG_MONITOR_LEN                (256 * 1024)    /* Reserve 256KiB */
 
-#define        CFG_ENV_IS_IN_FLASH     1
-#define CFG_ENV_SECT_SIZE      (32 * 1024)
-#define CFG_ENV_SIZE           CFG_ENV_SECT_SIZE
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define CONFIG_ENV_SECT_SIZE   (32 * 1024)
+#define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
 
 /* Address and size of Redundant Environment Sector    */
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_OFFSET + CFG_ENV_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 /* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end.
  * The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors,
  * if we put environment next to it, we will have to occupy 128KiB for it.
  * Putting it at the top of flash we use only 32KiB. */
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CONFIG_ENV_SECT_SIZE)
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup