arm/km: move CONFIG_EXTRA_ENV_SETTINGS from board to km_arm file

Since all the boards define the same env settings, this simplifies
the board files.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Detlev Zundel <dzu@denx.de>
cc: Prafulla Wadaskar <prafulla@marvell.com>

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index aa9f1ae464ef363a487caf1f41bb60fd56e65476..80a56dd1b7e596f342e245a57ac38f94a9c206e5 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -239,6 +239,21 @@ int get_scl(void);
                "sf write ${u-boot_addr_r} 0 ${filesize};"              \
                "spi off\0"
 
+/*
+ * Default environment variables
+ */
+#define CONFIG_EXTRA_ENV_SETTINGS                                      \
+       CONFIG_KM_DEF_ENV                                               \
+       "newenv=setenv addr 0x100000 && "                               \
+               "i2c dev 1; mw.b ${addr} 0 4 && "                       \
+               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
+               " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && "            \
+               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
+               " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0"       \
+       "rootpath=/opt/eldk/arm\0"                                      \
+       "EEprom_ivm=" KM_IVM_BUS "\0"                                   \
+       ""
+
 #if defined(CONFIG_SYS_NO_FLASH)
 #define CONFIG_KM_UBI_PARTITION_NAME   "ubi0"
 #undef CONFIG_FLASH_CFI_MTD

diff --git a/include/configs/mgcoge2un.h b/include/configs/mgcoge2un.h
index 62560350db30bd50bb60cef6d542d237eca10180..4e2a7740d7d428d0c77eb9d0b859c761a68b50fe 100644 (file)
--- a/include/configs/mgcoge2un.h
+++ b/include/configs/mgcoge2un.h
@@ -47,19 +47,4 @@
 #define KM_IVM_BUS     "pca9547:70:9" /* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS     "pca9547:70:d" /* I2C2 (Mux-Port 5)*/
 
-/*
- * Default environment variables
- */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       CONFIG_KM_DEF_ENV                                               \
-       "newenv=setenv addr 0x100000 && "                               \
-               "i2c dev 1; mw.b ${addr} 0 4 && "                       \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && "            \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0"       \
-       "rootpath=/opt/eldk/arm\0"                                      \
-       "EEprom_ivm=" KM_IVM_BUS "\0"                                   \
-       ""
-
 #endif /* _CONFIG_MGCOGE2UN_H */

diff --git a/include/configs/suen3.h b/include/configs/suen3.h
index aa4d7787b84e8c3c410a7e2cb70e11c6c6f0ab4c..0f1b11ea7d1064c93f323f3cc1dae7e82b313c5e 100644 (file)
--- a/include/configs/suen3.h
+++ b/include/configs/suen3.h
@@ -46,19 +46,4 @@
 #define KM_IVM_BUS     "pca9544a:70:9" /* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS     "pca9544a:70:d" /* I2C2 (Mux-Port 5)*/
 
-/*
- * Default environment variables
- */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       CONFIG_KM_DEF_ENV                                               \
-       "newenv=setenv addr 0x100000 && "                               \
-               "i2c dev 1; mw.b ${addr} 0 4 && "                       \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && "            \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0"       \
-       "rootpath=/opt/eldk/arm\0"                                      \
-       "EEprom_ivm=" KM_IVM_BUS "\0"                                   \
-       ""
-
 #endif /* _CONFIG_SUEN3_H */

diff --git a/include/configs/suen8.h b/include/configs/suen8.h
index b680dfbe74150fa37b1888165698a9062b65a8eb..78cee7556c45774692ff809c65613a79c9ecb1ee 100644 (file)
--- a/include/configs/suen8.h
+++ b/include/configs/suen8.h
@@ -47,19 +47,4 @@
 #define KM_IVM_BUS     "pca9544a:70:9" /* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS     "pca9544a:70:d" /* I2C2 (Mux-Port 5)*/
 
-/*
- * Default environment variables
- */
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       CONFIG_KM_DEF_ENV                                               \
-       "newenv=setenv addr 0x100000 && "                               \
-               "i2c dev 1; mw.b ${addr} 0 4 && "                       \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && "            \
-               "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR)        \
-               " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0"       \
-       "rootpath=/opt/eldk/arm\0"                                      \
-       "EEprom_ivm=" KM_IVM_BUS "\0"                                   \
-       ""
-
 #endif /* _CONFIG_SUEN8_H */