rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index 091da80..eb6a645 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -183,7 +183,7 @@
  */
 #undef CONFIG_BKUP_FLASH
 #define CFG_FLASH_CFI                          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER                   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER                        /* use the CFI driver */
 #ifdef CONFIG_BKUP_FLASH
 #define CFG_FLASH_BASE         0xFF800000      /* start of FLASH   */
 #define CFG_FLASH_SIZE         0x00800000      /* max flash size in bytes */
@@ -210,6 +210,7 @@
 
 #define CFG_CS0_CFG            0x05059310      /* ALE active low, data size 4bytes */
 #define CFG_CS2_CFG            0x05059010      /* ALE active low, data size 1byte */
+#define CFG_CS_ALETIMING       0x00000005      /* Use alternative CS timing for CS0 and CS2 */
 
 /* Use SRAM for initial stack */
 #define CFG_INIT_RAM_ADDR      CFG_SRAM_BASE           /* Initial RAM address */
@@ -319,7 +320,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 /* This has to be a multiple of the Flash sector size */
 #define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 #define CFG_ENV_SIZE           0x2000
@@ -435,16 +436,18 @@
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "u-boot_addr_r=200000\0"                                        \
-       "kernel_addr_r=300000\0"                                        \
-       "fdt_addr_r=400000\0"                                           \
-       "ramdisk_addr_r=500000\0"                                       \
+       "kernel_addr_r=600000\0"                                        \
+       "fdt_addr_r=880000\0"                                           \
+       "ramdisk_addr_r=900000\0"                                       \
        "u-boot_addr=FFF00000\0"                                        \
-       "kernel_addr=FC040000\0"                                        \
-       "fdt_addr=FC2C0000\0"                                           \
-       "ramdisk_addr=FC300000\0"                                       \
+       "kernel_addr=FFC40000\0"                                        \
+       "fdt_addr=FFEC0000\0"                                           \
+       "ramdisk_addr=FC040000\0"                                       \
        "ramdiskfile=ads5121/uRamdisk\0"                                \
-       "fdtfile=ads5121/ads5121.dtb\0"                                 \
        "u-boot=ads5121/u-boot.bin\0"                                   \
+       "bootfile=ads5121/uImage\0"                                     \
+       "fdtfile=ads5121/ads5121.dtb\0"                                 \
+       "rootpath=/opt/eldk/ppc_6xx\n"                                  \
        "netdev=eth0\0"                                                 \
        "consdev=ttyPSC0\0"                                             \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \