diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-20 22:57:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-20 22:57:25 +0200 |
| commit | f15f14e52879711be1d1bba2634dec684eda722e (patch) | |
| tree | b69ee65acc861356877bbaca6c072842e2a0efd7 | |
| parent | 997d2681d515dff622f35610de9c37faec272679 (diff) | |
| parent | 22f2017c31bc682e9b15612a5c2580ab5b84418e (diff) | |
| download | blackbird-obmc-uboot-f15f14e52879711be1d1bba2634dec684eda722e.tar.gz blackbird-obmc-uboot-f15f14e52879711be1d1bba2634dec684eda722e.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
| -rw-r--r-- | include/configs/P2020DS.h | 1 | ||||
| -rw-r--r-- | include/configs/XPEDITE5170.h | 1 | ||||
| -rw-r--r-- | include/configs/aria.h | 1 | ||||
| -rw-r--r-- | include/configs/mecp5123.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 676f0134fc..70ab96f335 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -412,7 +412,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy); #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* I2C bit-banged */ #define CONFIG_I2C_MULTI_BUS -#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_I2C_SLAVE 0x7F diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h index 2553293306..985b5893b2 100644 --- a/include/configs/XPEDITE5170.h +++ b/include/configs/XPEDITE5170.h @@ -254,7 +254,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_I2C_MULTI_BUS -#define CONFIG_I2C_CMD_TREE /* PEX8518 slave I2C interface */ #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 diff --git a/include/configs/aria.h b/include/configs/aria.h index e7e238d8f3..4211113d9e 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -376,7 +376,6 @@ #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* so disable bit-banged I2C */ #define CONFIG_I2C_MULTI_BUS -#define CONFIG_I2C_CMD_TREE /* I2C speed and slave address */ #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index e00859a021..1ecae005ce 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -249,7 +249,6 @@ #define CONFIG_HARD_I2C /* I2C with hardware support */ #undef CONFIG_SOFT_I2C /* so disable bit-banged I2C */ #define CONFIG_I2C_MULTI_BUS -#define CONFIG_I2C_CMD_TREE #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed */ #define CONFIG_SYS_I2C_SLAVE 0x7F /* slave address */ |
