X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fcommon.h;h=81f2b59dea1559a7d2a030b475786b06187d4680;hb=4194b3668a93eee18dd1f7eb1309ca7b05003aa7;hp=8197508b6d27994edfe61318121080e37d76fcc6;hpb=3e3989619f5ed3ee28002d985f3da28540586ab9;p=u-boot

diff --git a/include/common.h b/include/common.h
index 8197508b6d..81f2b59dea 100644
--- a/include/common.h
+++ b/include/common.h
@@ -336,7 +336,9 @@ extern void  pic_write (uchar reg, uchar val);
 #if defined(CONFIG_SPI) || !defined(CONFIG_SYS_I2C_EEPROM_ADDR)
 # define CONFIG_SYS_DEF_EEPROM_ADDR 0
 #else
+#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
+#endif
 #endif /* CONFIG_SPI || !defined(CONFIG_SYS_I2C_EEPROM_ADDR) */
 
 #if defined(CONFIG_SPI)
@@ -710,6 +712,7 @@ void show_boot_progress(int val);
 #ifdef CONFIG_MP
 int cpu_status(int nr);
 int cpu_reset(int nr);
+int cpu_disable(int nr);
 int cpu_release(int nr, int argc, char *argv[]);
 #endif