diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-16 22:06:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-16 22:06:51 +0100 |
| commit | 4c9e98ace78e7de972adf7da7135a46ec0a4ee7e (patch) | |
| tree | 286b22158fa780deb3fcad84f126e40315af6902 /include | |
| parent | 5e918a98c26e8ab9b5d2d48d998a2ced2b5b85b3 (diff) | |
| parent | 16c3cde050e2d243e62b37486f1558570787beb8 (diff) | |
| download | u-boot-imx-4c9e98ace78e7de972adf7da7135a46ec0a4ee7e.zip u-boot-imx-4c9e98ace78e7de972adf7da7135a46ec0a4ee7e.tar.gz u-boot-imx-4c9e98ace78e7de972adf7da7135a46ec0a4ee7e.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 10 | ||||
| -rw-r--r-- | include/configs/MPC8641HPCN.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index eb6ccb6..ac4b3e1 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -141,6 +141,9 @@ #endif #define CFG_ID_EEPROM +#ifdef CFG_ID_EEPROM +#define CONFIG_ID_EEPROM +#endif #define ID_EEPROM_ADDR 0x57 @@ -312,11 +315,8 @@ #define CONFIG_CMD_NET #define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_RTL8139 -#define CONFIG_SK98 -#define CONFIG_EEPRO100 -#define CONFIG_TULIP -#ifdef CONFIG_TULIP +#define CONFIG_ULI526X +#ifdef CONFIG_ULI526X #define CONFIG_ETHADDR 00:E0:0C:00:00:01 #endif diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 7f485c6..ab875f0 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -152,6 +152,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #define CFG_ID_EEPROM 1 +#ifdef CFG_ID_EEPROM +#define CONFIG_ID_EEPROM +#endif #define ID_EEPROM_ADDR 0x57 /* |