Merge branch 'master' of /home/wd/git/u-boot/master

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

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 2ef24cd7e506603e5b0fd825c1d5fe5d135c0ee6..abbaf383c75ccd49ab8c03721d57a703b3a71a19 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -137,10 +137,6 @@
 #define CONFIG_SYS_CCSRBAR_PHYS        CONFIG_SYS_CCSRBAR      /* physical addr of CCSRBAR */
 #define CONFIG_SYS_IMMR                CONFIG_SYS_CCSRBAR      /* PQII uses CONFIG_SYS_IMMR    */
 
-#define CONFIG_SYS_PCI1_ADDR           (CONFIG_SYS_CCSRBAR + 0x8000)
-#define CONFIG_SYS_PCI2_ADDR           (CONFIG_SYS_CCSRBAR + 0x9000)
-#define CONFIG_SYS_PCIE1_ADDR          (CONFIG_SYS_CCSRBAR + 0xa000)
-
 /*
  * DDR Setup
  */
@@ -165,15 +161,6 @@
 #define CONFIG_DDR_DEFAULT_CL  30              /* CAS latency 3        */
 #endif /* CONFIG_TQM8541 || CONFIG_TQM8555 || CONFIG_TQM8548 */
 
-/*
- * Old TQM85xx boards have 'M' type Spansion Flashes from the S29GLxxxM
- * series while new boards have 'N' type Flashes from the S29GLxxxN
- * series, which have bigger sectors: 2 x 128 instead of 2 x 64 KB.
- */
-#ifdef CONFIG_TQM8548
-#define CONFIG_TQM_FLASH_N_TYPE
-#endif /* CONFIG_TQM8548 */
-
 /*
  * Flash on the Local Bus
  */
@@ -293,6 +280,7 @@
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
+#define CONFIG_AUTO_COMPLETE   1       /* add autocompletion support */
 #define CONFIG_SYS_HUSH_PARSER         1       /* Use the HUSH parser          */
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
@@ -360,8 +348,6 @@
 /* NAND FLASH */
 #ifdef CONFIG_NAND
 
-#undef CONFIG_NAND_LEGACY
-
 #define CONFIG_NAND_FSL_UPM    1
 
 #define        CONFIG_MTD_NAND_ECC_JFFS2       1       /* use JFFS2 ECC        */
@@ -547,11 +533,7 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH 1
 
-#ifdef CONFIG_TQM_FLASH_N_TYPE
 #define CONFIG_ENV_SECT_SIZE   0x40000 /* 256K (one sector) for env    */
-#else /* !CONFIG_TQM_FLASH_N_TYPE */
-#define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) for env    */
-#endif /* CONFIG_TQM_FLASH_N_TYPE */
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
@@ -580,6 +562,8 @@
 #define        CONFIG_JFFS2_NAND       1
 
 #ifdef CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT         "nand0=TQM85xx-nand"
 #define MTDPARTS_DEFAULT       "mtdparts=TQM85xx-nand:-"
 #else
@@ -606,6 +590,7 @@
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_MII
+#define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
@@ -680,7 +665,7 @@
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        CONFIG_ENV_BOOTFILE                                             \
        CONFIG_ENV_FDT_FILE                                             \
-       CONFIG_ENV_CONSDEV                                                      \
+       CONFIG_ENV_CONSDEV                                              \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=$serverip:$rootpath\0"                         \
@@ -704,12 +689,11 @@
        "fdt_addr=ffec0000\0"                                           \
        "kernel_addr=ffd00000\0"                                        \
        "ramdisk_addr=ff800000\0"                                       \
-       CONFIG_ENV_UBOOT                                                        \
+       CONFIG_ENV_UBOOT                                                \
        "load=tftp 100000 $uboot\0"                                     \
        "update=protect off $uboot_addr +$filesize;"                    \
                "erase $uboot_addr +$filesize;"                         \
-               "cp.b 100000 $uboot_addr $filesize;"                    \
-               "setenv filesize;saveenv\0"                             \
+               "cp.b 100000 $uboot_addr $filesize"                     \
        "upd=run load update\0"                                         \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"