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

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

diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 533c7ad..582e670 100644 (file)
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -81,8 +81,8 @@
        "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=tqm8260/uImage\0"                             \
-       "kernel_addr=40080000\0"                                        \
-       "ramdisk_addr=40200000\0"                                       \
+       "kernel_addr=400C0000\0"                                        \
+       "ramdisk_addr=40240000\0"                                       \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
@@ -300,6 +300,13 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    240000  /* Flash Erase Timeout (in ms)  */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (in ms)  */
 
+/* use CFI flash driver */
+#define CONFIG_SYS_FLASH_CFI           1       /* Flash is CFI conformant */
+#define CONFIG_FLASH_CFI_DRIVER                1       /* Use the common driver */
+#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
+#define CONFIG_SYS_FLASH_EMPTY_INFO    1
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
+
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + 0x40000)
 #define CONFIG_ENV_SIZE                0x08000