| Message ID | 20170513031000.5429-9-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 69153988a6f4eda44257c6bc5afac484f8f95930 |
| Delegated to: | Heiko Schocher |
| Headers | show |
On Fri, May 12, 2017 at 09:09:56PM -0600, Simon Glass wrote: > Drop use of this long-deprecated option. > > Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Hello Simon, Am 13.05.2017 um 05:09 schrieb Simon Glass: > Drop use of this long-deprecated option. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v3: > - Update commit message so that it is unique in the series > - Fix up #ifdef in cmd/eeprom.c > - Drop changes to include/config headers > > Changes in v2: > - Drop changes to omap board.c files > > README | 16 ++++++++-------- > cmd/eeprom.c | 2 -- > common/board_f.c | 4 ++-- > common/stdio.c | 5 +---- > scripts/config_whitelist.txt | 1 - > 5 files changed, 11 insertions(+), 17 deletions(-) Thanks! Applied to u-boot-i2c.git master u-boot-i2c master just testing on travis: https://travis-ci.org/hsdenx/u-boot-i2c/builds/232288665 bye, Heiko > > diff --git a/README b/README > index 86f0814f79..11fa84ccc4 100644 > --- a/README > +++ b/README > @@ -2204,7 +2204,9 @@ The following options need to be configured: > > If you do not have i2c muxes on your board, omit this define. > > -- Legacy I2C Support: CONFIG_HARD_I2C > +----under removal: > + > +- Legacy I2C Support: CONFIG_SOFT_I2C > > NOTE: It is intended to move drivers to CONFIG_SYS_I2C which > provides the following compelling advantages: > @@ -2213,14 +2215,12 @@ The following options need to be configured: > - approved multibus support > - better i2c mux support > > - ** CONFIG_HARD_I2C is now being removed ** > - > -----under removal: > + ** CONFIG_SOFT_I2C is now being removed ** > > - In both cases you will need to define CONFIG_SYS_I2C_SPEED > - to be the frequency (in Hz) at which you wish your i2c bus > - to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie > - the CPU's i2c node address). > + With CONFIG_SOFT_I2C you will need to define > + CONFIG_SYS_I2C_SPEED to be the frequency (in Hz) at which you > + wish your i2c bus to run and CONFIG_SYS_I2C_SLAVE to be the > + address of this node (ie the CPU's i2c node address). > > Now, the u-boot i2c code for the mpc8xx > (arch/powerpc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node > diff --git a/cmd/eeprom.c b/cmd/eeprom.c > index 0a0e4a2c1c..e43566bc56 100644 > --- a/cmd/eeprom.c > +++ b/cmd/eeprom.c > @@ -73,11 +73,9 @@ void eeprom_init(int bus) > #endif > > /* I2C EEPROM */ > -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) > #if defined(CONFIG_SYS_I2C) > if (bus >= 0) > i2c_set_bus_num(bus); > -#endif > i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); > #endif > } > diff --git a/common/board_f.c b/common/board_f.c > index d9431ee79a..eed3e7be2a 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -184,7 +184,7 @@ __weak int dram_init_banksize(void) > return 0; > } > > -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) > +#if defined(CONFIG_SYS_I2C) > static int init_func_i2c(void) > { > puts("I2C: "); > @@ -765,7 +765,7 @@ static const init_fnc_t init_sequence_f[] = { > misc_init_f, > #endif > INIT_FUNC_WATCHDOG_RESET > -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) > +#if defined(CONFIG_SYS_I2C) > init_func_i2c, > #endif > #if defined(CONFIG_HARD_SPI) > diff --git a/common/stdio.c b/common/stdio.c > index 4d30017530..ee4f0bda9e 100644 > --- a/common/stdio.c > +++ b/common/stdio.c > @@ -21,7 +21,7 @@ > #include <logbuff.h> > #endif > > -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) > +#if defined(CONFIG_SYS_I2C) > #include <i2c.h> > #endif > > @@ -346,9 +346,6 @@ int stdio_add_devices(void) > #ifdef CONFIG_SYS_I2C > i2c_init_all(); > #else > -#if defined(CONFIG_HARD_I2C) > - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); > -#endif > #endif > #ifdef CONFIG_DM_VIDEO > /* > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 7646bb6842..da37e49c83 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -1134,7 +1134,6 @@ CONFIG_G_DNL_UMS_VENDOR_NUM > CONFIG_H264_FREQ > CONFIG_H8300 > CONFIG_HALEAKALA > -CONFIG_HARD_I2C > CONFIG_HARD_SPI > CONFIG_HASH_VERIFY > CONFIG_HAS_DATAFLASH >
diff --git a/README b/README index 86f0814f79..11fa84ccc4 100644 --- a/README +++ b/README @@ -2204,7 +2204,9 @@ The following options need to be configured: If you do not have i2c muxes on your board, omit this define. -- Legacy I2C Support: CONFIG_HARD_I2C +----under removal: + +- Legacy I2C Support: CONFIG_SOFT_I2C NOTE: It is intended to move drivers to CONFIG_SYS_I2C which provides the following compelling advantages: @@ -2213,14 +2215,12 @@ The following options need to be configured: - approved multibus support - better i2c mux support - ** CONFIG_HARD_I2C is now being removed ** - -----under removal: + ** CONFIG_SOFT_I2C is now being removed ** - In both cases you will need to define CONFIG_SYS_I2C_SPEED - to be the frequency (in Hz) at which you wish your i2c bus - to run and CONFIG_SYS_I2C_SLAVE to be the address of this node (ie - the CPU's i2c node address). + With CONFIG_SOFT_I2C you will need to define + CONFIG_SYS_I2C_SPEED to be the frequency (in Hz) at which you + wish your i2c bus to run and CONFIG_SYS_I2C_SLAVE to be the + address of this node (ie the CPU's i2c node address). Now, the u-boot i2c code for the mpc8xx (arch/powerpc/cpu/mpc8xx/i2c.c) sets the CPU up as a master node diff --git a/cmd/eeprom.c b/cmd/eeprom.c index 0a0e4a2c1c..e43566bc56 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -73,11 +73,9 @@ void eeprom_init(int bus) #endif /* I2C EEPROM */ -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) #if defined(CONFIG_SYS_I2C) if (bus >= 0) i2c_set_bus_num(bus); -#endif i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); #endif } diff --git a/common/board_f.c b/common/board_f.c index d9431ee79a..eed3e7be2a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -184,7 +184,7 @@ __weak int dram_init_banksize(void) return 0; } -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) static int init_func_i2c(void) { puts("I2C: "); @@ -765,7 +765,7 @@ static const init_fnc_t init_sequence_f[] = { misc_init_f, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) init_func_i2c, #endif #if defined(CONFIG_HARD_SPI) diff --git a/common/stdio.c b/common/stdio.c index 4d30017530..ee4f0bda9e 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -21,7 +21,7 @@ #include <logbuff.h> #endif -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) #include <i2c.h> #endif @@ -346,9 +346,6 @@ int stdio_add_devices(void) #ifdef CONFIG_SYS_I2C i2c_init_all(); #else -#if defined(CONFIG_HARD_I2C) - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); -#endif #endif #ifdef CONFIG_DM_VIDEO /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7646bb6842..da37e49c83 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1134,7 +1134,6 @@ CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_H264_FREQ CONFIG_H8300 CONFIG_HALEAKALA -CONFIG_HARD_I2C CONFIG_HARD_SPI CONFIG_HASH_VERIFY CONFIG_HAS_DATAFLASH
Drop use of this long-deprecated option. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: - Update commit message so that it is unique in the series - Fix up #ifdef in cmd/eeprom.c - Drop changes to include/config headers Changes in v2: - Drop changes to omap board.c files README | 16 ++++++++-------- cmd/eeprom.c | 2 -- common/board_f.c | 4 ++-- common/stdio.c | 5 +---- scripts/config_whitelist.txt | 1 - 5 files changed, 11 insertions(+), 17 deletions(-)