diff options
author | Wolfgang Denk <wd@denx.de> | 2007-07-06 10:38:28 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-07-06 10:38:28 +0200 |
commit | dcc0264878406d52b879d2e5a63d3d793371434e (patch) | |
tree | 3a2d693997fad34fd049a56518dbb44195342392 /include/configs/TQM834x.h | |
parent | 6b0a174a1e6f55e1f5a1fbb223cdad7645a4646e (diff) | |
parent | e4dbe1b215f5c6c462e76909d240bd96472b84de (diff) | |
download | u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.zip u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.tar.gz u-boot-imx-dcc0264878406d52b879d2e5a63d3d793371434e.tar.bz2 |
Merge with git://www.denx.de/git/u-boot-testing
Diffstat (limited to 'include/configs/TQM834x.h')
-rw-r--r-- | include/configs/TQM834x.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 9628703..684cb30 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -281,7 +281,6 @@ extern int tqm834x_num_flash_banks; #define CFG_PCI1_IO_PHYS CFG_PCI1_IO_BASE #define CFG_PCI1_IO_SIZE 0x1000000 /* 16M */ - #undef CONFIG_EEPRO100 #define CONFIG_EEPRO100 #undef CONFIG_TULIP @@ -316,7 +315,6 @@ extern int tqm834x_num_flash_banks; #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ - /* * Command line configuration. */ @@ -339,10 +337,6 @@ extern int tqm834x_num_flash_banks; #undef CONFIG_CMD_LOADS #endif - - - - /* * Miscellaneous configurable options */ |