diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-08 00:06:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-08 00:06:31 +0200 |
| commit | 6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5 (patch) | |
| tree | df5b6d67be790d75e60f8fcd97360fc1f179ab0d /include/configs | |
| parent | d8bc0a2889700ba063598de6d4e7d135360b537e (diff) | |
| parent | b5045cdda556c73e2697cd1d3ea6563315cbf490 (diff) | |
| download | u-boot-imx-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.zip u-boot-imx-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.tar.gz u-boot-imx-6a1f7e54c2dd8888dbc118e8de372dec29a0a9c5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/meesc.h | 1 | ||||
| -rw-r--r-- | include/configs/otc570.h | 1 | ||||
| -rw-r--r-- | include/configs/smdkc100.h | 12 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/configs/meesc.h b/include/configs/meesc.h index d002b97..e085f4a 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -82,7 +82,6 @@ */ #include <config_cmd_default.h> #undef CONFIG_CMD_BDI -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS diff --git a/include/configs/otc570.h b/include/configs/otc570.h index 4fde012..fb0f576 100644 --- a/include/configs/otc570.h +++ b/include/configs/otc570.h @@ -131,7 +131,6 @@ * Command line configuration. */ #include <config_cmd_default.h> -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_LOADS #undef CONFIG_CMD_IMLS diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index a8ba052..09bce6d 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -83,7 +83,6 @@ #undef CONFIG_CMD_FLASH #undef CONFIG_CMD_IMLS #undef CONFIG_CMD_NAND -#undef CONFIG_CMD_NET #define CONFIG_CMD_CACHE #define CONFIG_CMD_REGINFO @@ -235,4 +234,15 @@ #define CONFIG_DOS_PARTITION 1 +/* + * Ethernet Contoller driver + */ +#ifdef CONFIG_CMD_NET +#define CONFIG_NET_MULTI +#define CONFIG_SMC911X 1 /* we have a SMC9115 on-board */ +#define CONFIG_SMC911X_16_BIT 1 /* SMC911X_16_BIT Mode */ +#define CONFIG_SMC911X_BASE 0x98800300 /* SMC911X Drive Base */ +#define CONFIG_ENV_SROM_BANK 3 /* Select SROM Bank-3 for Ethernet*/ +#endif /* CONFIG_CMD_NET */ + #endif /* __CONFIG_H */ |