summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@keymile.com>2015-11-13 15:01:14 +0100
committerTom Rini <trini@konsulko.com>2015-11-18 14:50:07 -0500
commit716e4ffe99152ea572c7913462dcdf981023050f (patch)
tree0ab10552483b6b6bda2f707d5eba7cfdaaa750af /include
parentdfd1bb4ec89e8b1e87f0605af2345ad6dcf777da (diff)
arm/km_kirkwood: remove KM_ENV_BUS and use CONFIG_I2C_ENV_EEPROM_BUS
KM_ENV_BUS was used for nothing else than an direct assignment to CONFIG_I2C_ENV_EEPROM_BUS. To avoid this, directly use CONFIG_I2C_ENV_EEPROM_BUS instead. Patchwork: http://patchwork.ozlabs.org/patch/399411/ Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/km/km_arm.h2
-rw-r--r--include/configs/km_kirkwood.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index b89af535ab..77487ead5a 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -241,7 +241,7 @@ int get_scl(void);
#define CONFIG_SYS_EEPROM_WREN
#define CONFIG_ENV_OFFSET 0x0 /* no bracets! */
#define CONFIG_ENV_SIZE (0x2000 - CONFIG_ENV_OFFSET)
-#define CONFIG_I2C_ENV_EEPROM_BUS KM_ENV_BUS
+#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
#define CONFIG_ENV_OFFSET_REDUND 0x2000 /* no bracets! */
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#endif
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index dc2615533c..a445aaf09d 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -116,10 +116,6 @@
/* include common defines/options for all arm based Keymile boards */
#include "km/km_arm.h"
-#ifndef CONFIG_KM_ENV_IS_IN_SPI_NOR
-#define KM_ENV_BUS 5 /* I2C2 (Mux-Port 5)*/
-#endif
-
#if defined(CONFIG_KM_PIGGY4_88E6352)
/*
* Some keymile boards like mgcoge5un & nusa1 have their PIGGY4 connected via