summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-04-16 10:27:31 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-04-16 10:27:31 +0200
commit807522fc9ae49e022c9f3556506b4f4c961b17aa (patch)
tree2f490b01ed00c70cb2eec4a89667cbb9da1ef5a2 /include
parentb81a4630a3914d611ca3e72b451c4509c60ae9b1 (diff)
parentad88297e2f14220f34417d1304d256285887aed4 (diff)
downloadu-boot-imx-807522fc9ae49e022c9f3556506b4f4c961b17aa.zip
u-boot-imx-807522fc9ae49e022c9f3556506b4f4c961b17aa.tar.gz
u-boot-imx-807522fc9ae49e022c9f3556506b4f4c961b17aa.tar.bz2
Merge with /home/hs/U-Boot/u-boot-dev
Diffstat (limited to 'include')
-rw-r--r--include/configs/dbau1x00.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0a10e3c..4cc5085 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -81,8 +81,7 @@
CFG_CMD_MII | CFG_CMD_RUN | CFG_CMD_BDI | CFG_CMD_BEDBUG | \
CFG_CMD_NFS | CFG_CMD_ELF | CFG_CMD_PCMCIA | CFG_CMD_I2C))
#else /* CONFIG_DBAU1550 */
-/* Boot from Compact flash partition 2 as default */
-#define CONFIG_BOOTCOMMAND "ide reset;disk 0x81000000 0:2;bootm"
+#define CONFIG_BOOTCOMMAND "bootp;bootm"
#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_IDE | CFG_CMD_DHCP | CFG_CMD_ELF) & \
~(CFG_CMD_ENV | CFG_CMD_FAT | CFG_CMD_FLASH | CFG_CMD_FPGA | \
@@ -133,8 +132,6 @@
#define PHYS_FLASH_1 0xb8000000 /* Flash Bank #1 */
#define PHYS_FLASH_2 0xbc000000 /* Flash Bank #2 */
-#define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2}
-
#else /* CONFIG_DBAU1550 */
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
@@ -145,6 +142,8 @@
#endif /* CONFIG_DBAU1550 */
+#define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2}
+
#define CFG_FLASH_CFI 1
#define CFG_FLASH_CFI_DRIVER 1