diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-08-25 23:03:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-08-25 23:03:22 +0200 |
| commit | d3870bd2d832ea2048b7cb2bbb9d642585b137cf (patch) | |
| tree | 73051933cff1366b6ec7ce2da6bcd049875a0905 /include/configs/armadillo.h | |
| parent | 68ccfa482be0c7e4aa18285aceb214ed7f5d8e89 (diff) | |
| parent | 0d071cdd782e917b43e04869843df31670231ffd (diff) | |
| download | u-boot-imx-d3870bd2d832ea2048b7cb2bbb9d642585b137cf.zip u-boot-imx-d3870bd2d832ea2048b7cb2bbb9d642585b137cf.tar.gz u-boot-imx-d3870bd2d832ea2048b7cb2bbb9d642585b137cf.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-net into next
Diffstat (limited to 'include/configs/armadillo.h')
| -rw-r--r-- | include/configs/armadillo.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h index f7eec27..49ea3a1 100644 --- a/include/configs/armadillo.h +++ b/include/configs/armadillo.h @@ -56,10 +56,11 @@ /* * Hardware drivers */ -#define CONFIG_DRIVER_CS8900 1 /* we have a CS8900 on-board */ -#define CS8900_BASE 0x20000300 /* armadillo board */ -#define CS8900_BUS16 1 -#undef CS8900_BUS32 +#define CONFIG_NET_MULTI +#define CONFIG_CS8900 /* we have a CS8900 on-board */ +#define CONFIG_CS8900_BASE 0x20000300 /* armadillo board */ +#define CONFIG_CS8900_BUS16 +#undef CONFIG_CS8900_BUS32 /* * select serial console configuration |