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/DK1S10.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/DK1S10.h')
-rw-r--r-- | include/configs/DK1S10.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h index ae567a3..6e78861 100644 --- a/include/configs/DK1S10.h +++ b/include/configs/DK1S10.h @@ -249,15 +249,17 @@ /********************************************/ /* !!! CS8900 is __not__ tested on NIOS !!! */ /********************************************/ -#define CONFIG_DRIVER_CS8900 /* Using CS8900 */ -#define CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + CONFIG_SYS_NIOS_CPU_LAN0_OFFS) +#define CONFIG_NET_MULTI +#define CONFIG_CS8900 /* Using CS8900 */ +#define CONFIG_CS8900_BASE (CONFIG_SYS_NIOS_CPU_LAN0_BASE + \ + CONFIG_SYS_NIOS_CPU_LAN0_OFFS) #if (CONFIG_SYS_NIOS_CPU_LAN0_BUSW == 32) -#undef CS8900_BUS16 -#define CS8900_BUS32 1 +#undef CONFIG_CS8900_BUS16 +#define CONFIG_CS8900_BUS32 #else /* no */ -#define CS8900_BUS16 1 -#undef CS8900_BUS32 +#define CONFIG_CS8900_BUS16 +#undef CONFIG_CS8900_BUS32 #endif #else |