diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-07-21 12:37:56 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-07-21 12:37:56 +0200 |
commit | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (patch) | |
tree | 5df2528b42f073dd5bbb34b14f288a1811073729 /include/configs/MPC8610HPCD.h | |
parent | 262423955895ba4599fa11d7c49dcffb65af0afd (diff) | |
parent | 1953d128fd07f07d1c3810a28c0863ea64dae1b6 (diff) | |
download | u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.zip u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.gz u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/MPC8610HPCD.h')
-rw-r--r-- | include/configs/MPC8610HPCD.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index fc16890..06899b1 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -140,11 +140,11 @@ #endif #endif -#define CFG_ID_EEPROM -#ifdef CFG_ID_EEPROM #define CONFIG_ID_EEPROM -#endif -#define ID_EEPROM_ADDR 0x57 +#define CFG_I2C_EEPROM_NXID +#define CFG_ID_EEPROM +#define CFG_I2C_EEPROM_ADDR 0x57 +#define CFG_I2C_EEPROM_ADDR_LEN 1 #define CFG_FLASH_BASE 0xf0000000 /* start of FLASH 128M */ @@ -485,7 +485,8 @@ #endif -#undef CONFIG_WATCHDOG /* watchdog disabled */ +#define CONFIG_WATCHDOG /* watchdog enabled */ +#define CFG_WATCHDOG_FREQ 5000 /* Feed interval, 5s */ /*DIU Configuration*/ #define DIU_CONNECT_TO_DVI /* DIU controller connects to DVI encoder*/ |