diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-07 23:59:10 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-07 23:59:10 +0200 |
| commit | e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3 (patch) | |
| tree | e700a523f54c5ed18bf15f832158f90a31517c85 /include/configs/MPC8323ERDB.h | |
| parent | 23c5189e6c969255f8c91b30fdf1cf81b698329d (diff) | |
| parent | 70431e8a7393b6b793f77957f95b999fc9a269b8 (diff) | |
| download | bootable_bootloader_goldelico_gta04-e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3.zip bootable_bootloader_goldelico_gta04-e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3.tar.gz bootable_bootloader_goldelico_gta04-e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Conflicts:
lib_ppc/board.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/MPC8323ERDB.h')
| -rw-r--r-- | include/configs/MPC8323ERDB.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 94c4c6b..92d7aa4 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -323,8 +323,11 @@ /* * Config on-board EEPROM */ -#define CFG_I2C_EEPROM_ADDR 0x50 -#define CFG_I2C_EEPROM_ADDR_LEN 2 +#define CFG_I2C_EEPROM_ADDR 0x50 +#define CFG_I2C_EEPROM_ADDR_LEN 2 +#define CFG_EEPROM_PAGE_WRITE_BITS 6 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 +#define CFG_EEPROM_PAGE_WRITE_ENABLE /* * General PCI @@ -341,7 +344,7 @@ #define CFG_PCI1_IO_SIZE 0x04000000 /* 64M */ #ifdef CONFIG_PCI - +#define CONFIG_PCI_SKIP_HOST_BRIDGE #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ @@ -549,6 +552,9 @@ #define CONFIG_HAS_ETH1 /* add support for "eth1addr" */ #define CONFIG_ETH1ADDR 00:04:9f:ef:03:02 +/* use mac_read_from_eeprom() to read ethaddr from I2C EEPROM (see CFG_I2C_EEPROM) */ +#define CFG_I2C_MAC_OFFSET 0x7f00 /* MAC address offset in I2C EEPROM */ + #define CONFIG_IPADDR 10.0.0.2 #define CONFIG_SERVERIP 10.0.0.1 #define CONFIG_GATEWAYIP 10.0.0.1 |