[U-Boot] [PATCH 20/31] mpc83xx, kmeter1: extract common I2C options in keymile header
Signed-off-by: Heiko Schocher hs@denx.de --- include/configs/keymile-common.h | 8 ++++---- include/configs/kmeter1.h | 19 ------------------- 2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 99c3380..4ff6fb7 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -42,8 +42,6 @@ #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING - -/* should go away, if kmeter I2C support is enabled */ #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C @@ -101,7 +99,6 @@ #define CONFIG_SYS_SLOT_ID_OFF (0x07) /* register offset */ #define CONFIG_SYS_SLOT_ID_MASK (0x3f) /* mask for slot ID bits */
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_I2C_MULTI_BUS 1 #define CONFIG_I2C_CMD_TREE 1 #define CONFIG_SYS_MAX_I2C_BUS 2 @@ -109,7 +106,11 @@ #define CONFIG_I2C_MUX 1
/* EEprom support */ +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 +#else +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#endif #define CONFIG_SYS_I2C_MULTI_EEPROMS 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 @@ -119,7 +120,6 @@ #define CONFIG_SYS_IVM_EEPROM_ADR 0x50 #define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400 #define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100 -#endif
#define CONFIG_SYS_FLASH_PROTECTION 1
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 31e5cd6..f6b4035 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -309,29 +309,10 @@ #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_FSL_I2C -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_I2C_SPEED 200000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_OFFSET 0x3000
-#define CONFIG_SYS_MAX_I2C_BUS 2 -#define CONFIG_SYS_I2C_INIT_BOARD 1 -#define CONFIG_I2C_MUX 1 - -/* EEprom support */ -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS 1 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE -#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 - -#define CONFIG_HUSH_INIT_VAR 1 -/* Support the IVM EEprom */ -#define CONFIG_SYS_IVM_EEPROM_ADR 0x50 -#define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400 -#define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100 - /* I2C SYSMON (LM75, AD7414 is almost compatible) */ #define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */ #define CONFIG_DTT_SENSORS {0, 1, 2, 3} /* Sensor addresses */
On Wed, 28 Jan 2009 10:40:16 +0100 Heiko Schocher hs@denx.de wrote:
Signed-off-by: Heiko Schocher hs@denx.de
include/configs/keymile-common.h | 8 ++++---- include/configs/kmeter1.h | 19 -------------------
a lot of patches in this patchseries touch a lot of the same files - can you please reorganize the series so that we don't have to review something that's going to change again in a subsequent patch?
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 99c3380..4ff6fb7 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -42,8 +42,6 @@ #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING
-/* should go away, if kmeter I2C support is enabled */ #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C
the comment alludes that something should go away yet nothing's going away but the comment itself.
If there is indeed nothing to take away, then these are the types of things you need to state why in your commit message.
@@ -101,7 +99,6 @@ #define CONFIG_SYS_SLOT_ID_OFF (0x07) /* register offset */ #define CONFIG_SYS_SLOT_ID_MASK (0x3f) /* mask for slot ID bits */
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_I2C_MULTI_BUS 1 #define CONFIG_I2C_CMD_TREE 1 #define CONFIG_SYS_MAX_I2C_BUS 2 @@ -109,7 +106,11 @@ #define CONFIG_I2C_MUX 1
/* EEprom support */ +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 +#else +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#endif
if this differs per board, shouldn't it be set in the board config, and not the common config?
Kim
Hello Kim,
Kim Phillips wrote:
On Wed, 28 Jan 2009 10:40:16 +0100 Heiko Schocher hs@denx.de wrote:
Signed-off-by: Heiko Schocher hs@denx.de
include/configs/keymile-common.h | 8 ++++---- include/configs/kmeter1.h | 19 -------------------
a lot of patches in this patchseries touch a lot of the same files - can you please reorganize the series so that we don't have to review something that's going to change again in a subsequent patch?
Yes, I will reorganize this patchset complete.
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index 99c3380..4ff6fb7 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -42,8 +42,6 @@ #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING
-/* should go away, if kmeter I2C support is enabled */ #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C
the comment alludes that something should go away yet nothing's going away but the comment itself.
If there is indeed nothing to take away, then these are the types of things you need to state why in your commit message.
Ok.
@@ -101,7 +99,6 @@ #define CONFIG_SYS_SLOT_ID_OFF (0x07) /* register offset */ #define CONFIG_SYS_SLOT_ID_MASK (0x3f) /* mask for slot ID bits */
-#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_I2C_MULTI_BUS 1 #define CONFIG_I2C_CMD_TREE 1 #define CONFIG_SYS_MAX_I2C_BUS 2 @@ -109,7 +106,11 @@ #define CONFIG_I2C_MUX 1
/* EEprom support */ +#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 +#else +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#endif
if this differs per board, shouldn't it be set in the board config, and not the common config?
Yes, that would be the right place.
thanks Heiko
participants (2)
-
Heiko Schocher -
Kim Phillips