rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/korat.h b/include/configs/korat.h
index 765566697f9fec94ed81a3ea3e1b387a2ab2cb12..214cb429bcd97d03c9fbabf2d49b222c552b0ca6 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -104,13 +104,13 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1       /* use FLASH for environ vars   */
+#define CONFIG_ENV_IS_IN_FLASH 1       /* use FLASH for environ vars   */
 
 /*
  * FLASH related
  */
 #define CFG_FLASH_CFI                  /* The flash is CFI compatible        */
-#define CFG_FLASH_CFI_DRIVER           /* Use common CFI driver              */
+#define CONFIG_FLASH_CFI_DRIVER                /* Use common CFI driver              */
 #define CONFIG_FLASH_CFI_LEGACY                /* Allow hard-coded config for FLASH0 */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH1_ADDR, CFG_FLASH0_ADDR }
@@ -127,13 +127,13 @@
 #define CFG_FLASH_EMPTY_INFO         /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash      */
 
-#define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector        */
-#define CFG_ENV_ADDR           (CFG_FLASH1_TOP - CFG_ENV_SECT_SIZE)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector   */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector        */
+#define CONFIG_ENV_ADDR                (CFG_FLASH1_TOP - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE                0x2000  /* Total Size of Environment Sector   */
 
 /* Address and size of Redundant Environment Sector */
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    CFG_ENV_SIZE
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 /*
  * DDR SDRAM
@@ -145,7 +145,6 @@
 #define CONFIG_DDR_ECC                 /* Use ECC when available       */
 #define SPD_EEPROM_ADDRESS     {0x50}
 #define CONFIG_PROG_SDRAM_TLB
-#define CFG_DRAM_TEST
 #define CFG_MEM_TOP_HIDE       (4 << 10) /* don't use last 4kbytes     */
                                        /* 440EPx errata CHIP 11        */
 
@@ -185,7 +184,7 @@
 #define CFG_ROOTPATH           "rootpath=/opt/eldk/ppc_4xxFP\0"
 
 /* Note: kernel_addr and ramdisk_addr assume that FLASH1 is 64 MiB. */
-#define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+#define CONFIG_EXTRA_ENV_SETTINGS                                      \
        CFG_BOOTFILE                                                    \
        CFG_ROOTPATH                                                    \
        "netdev=eth0\0"                                                 \
@@ -216,7 +215,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
 
-#define        CONFIG_IBM_EMAC4_V4     1
+#define CONFIG_IBM_EMAC4_V4    1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                2       /* PHY address, See schematics  */
 #define CONFIG_PHY_DYNAMIC_ANEG        1
@@ -548,4 +547,8 @@
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use     */
 #endif
 
+/* Pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */