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

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

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index dee6643..dd71862 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -137,7 +137,7 @@
  *                    Monitor Stack Buffer (0x80)
  *     0x0FF5 FFB0     Board Info Data
  *     0x0FF6 0000     Malloc Arena
- *          :              CFG_ENV_SECT_SIZE, 256k
+ *          :              CONFIG_ENV_SECT_SIZE, 256k
  *          :              CFG_MALLOC_LEN,    128k
  *     0x0FFC 0000     RAM Copy of Monitor Code
  *          :              CFG_MONITOR_LEN,   256k
@@ -200,7 +200,7 @@
  * put in the same sector as U-Boot, and changing variables
  * will erase U-Boot temporarily
  */
-#define CFG_ENV_IN_OWN_SECT    1
+#define CONFIG_ENV_IN_OWN_SECT 1
 
 /* Define to allow the user to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -334,7 +334,7 @@
 #define CFG_STACK_USAGE                0x10000 /* Reserve 64k for the stack usage */
 #define CFG_MEM_END_USAGE      ( CFG_MONITOR_LEN \
                                + CFG_MALLOC_LEN \
-                               + CFG_ENV_SECT_SIZE \
+                               + CONFIG_ENV_SECT_SIZE \
                                + CFG_STACK_USAGE )
 
 #define CFG_MEMTEST_END                ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@ -452,7 +452,7 @@
  */
 
 #define CFG_FLASH_CFI          1       /* Flash is CFI conformant              */
-#define CFG_FLASH_CFI_DRIVER   1       /* Use the common driver                */
+#define CONFIG_FLASH_CFI_DRIVER        1       /* Use the common driver                */
 #define CFG_MAX_FLASH_SECT     128     /* max number of sectors on one chip    */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_FLASH_INCREMENT    0       /* there is only one bank               */
@@ -462,21 +462,21 @@
 
 #ifndef CFG_RAMBOOT
 
-#  define CFG_ENV_IS_IN_FLASH  1
-#  ifdef CFG_ENV_IN_OWN_SECT
-#    define CFG_ENV_ADDR       (CFG_MONITOR_BASE + 0x40000)
-#    define CFG_ENV_SECT_SIZE  0x40000
+#  define CONFIG_ENV_IS_IN_FLASH       1
+#  ifdef CONFIG_ENV_IN_OWN_SECT
+#    define CONFIG_ENV_ADDR    (CFG_MONITOR_BASE + 0x40000)
+#    define CONFIG_ENV_SECT_SIZE       0x40000
 #  else
-#    define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CFG_ENV_SECT_SIZE)
-#    define CFG_ENV_SIZE       0x1000  /* Total Size of Environment Sector     */
-#    define CFG_ENV_SECT_SIZE  0x40000 /* see README - env sect real size      */
-#  endif /* CFG_ENV_IN_OWN_SECT */
+#    define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFIG_ENV_SECT_SIZE)
+#    define CONFIG_ENV_SIZE    0x1000  /* Total Size of Environment Sector     */
+#    define CONFIG_ENV_SECT_SIZE       0x40000 /* see README - env sect real size      */
+#  endif /* CONFIG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_FLASH  1
-#  define CFG_ENV_ADDR         (CFG_FLASH_BASE + 0x40000)
-#define CFG_ENV_SIZE           0x1000
-#  define CFG_ENV_SECT_SIZE    0x40000
+#  define CONFIG_ENV_IS_IN_FLASH       1
+#  define CONFIG_ENV_ADDR              (CFG_FLASH_BASE + 0x40000)
+#define CONFIG_ENV_SIZE                0x1000
+#  define CONFIG_ENV_SECT_SIZE 0x40000
 #endif /* CFG_RAMBOOT */
 
 /*-----------------------------------------------------------------------