| Message ID | 20170513031000.5429-12-sjg@chromium.org |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Heiko Schocher |
| Headers | show |
Hello Simon, Am 13.05.2017 um 05:09 schrieb Simon Glass: > This option is not used in U-Boot. Drop it. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v3: None > Changes in v2: None > > README | 6 ------ > common/board_r.c | 17 ----------------- > scripts/config_whitelist.txt | 1 - > 3 files changed, 24 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 96ce6289ea..71d8de0ba8 100644 > --- a/README > +++ b/README > @@ -2323,12 +2323,6 @@ The following options need to be configured: > custom i2c_init_board() routine in boards/xxx/board.c > is run early in the boot sequence. > > - CONFIG_I2CFAST (PPC405GP|PPC405EP only) > - > - This option enables configuration of bi_iic_fast[] flags > - in u-boot bd_info structure based on u-boot environment > - variable "i2cfast". (see also i2cfast) > - > CONFIG_I2C_MULTI_BUS > > This option allows the use of multiple I2C buses, each of which > diff --git a/common/board_r.c b/common/board_r.c > index d69a33c4a3..dba2102b18 100644 > --- a/common/board_r.c > +++ b/common/board_r.c > @@ -485,24 +485,7 @@ static int initr_env(void) > > /* Initialize from environment */ > load_addr = getenv_ulong("loadaddr", 16, load_addr); > -#if defined(CONFIG_SYS_EXTBDINFO) > -#if defined(CONFIG_405GP) || defined(CONFIG_405EP) > -#if defined(CONFIG_I2CFAST) > - /* > - * set bi_iic_fast for linux taking environment variable > - * "i2cfast" into account > - */ > - { > - char *s = getenv("i2cfast"); > > - if (s && ((*s == 'y') || (*s == 'Y'))) { > - gd->bd->bi_iic_fast[0] = 1; > - gd->bd->bi_iic_fast[1] = 1; > - } > - } > -#endif /* CONFIG_I2CFAST */ > -#endif /* CONFIG_405GP, CONFIG_405EP */ > -#endif /* CONFIG_SYS_EXTBDINFO */ > return 0; > } > > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 5cdca33f87..7cdfcd0a52 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -1319,7 +1319,6 @@ CONFIG_HW_ENV_SETTINGS > CONFIG_HW_WATCHDOG > CONFIG_HW_WATCHDOG_TIMEOUT_MS > CONFIG_I2C > -CONFIG_I2CFAST > CONFIG_I2C_CHIPADDRESS > CONFIG_I2C_CMD_TREE > CONFIG_I2C_ENV_EEPROM_BUS >
diff --git a/README b/README index 96ce6289ea..71d8de0ba8 100644 --- a/README +++ b/README @@ -2323,12 +2323,6 @@ The following options need to be configured: custom i2c_init_board() routine in boards/xxx/board.c is run early in the boot sequence. - CONFIG_I2CFAST (PPC405GP|PPC405EP only) - - This option enables configuration of bi_iic_fast[] flags - in u-boot bd_info structure based on u-boot environment - variable "i2cfast". (see also i2cfast) - CONFIG_I2C_MULTI_BUS This option allows the use of multiple I2C buses, each of which diff --git a/common/board_r.c b/common/board_r.c index d69a33c4a3..dba2102b18 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -485,24 +485,7 @@ static int initr_env(void) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_SYS_EXTBDINFO) -#if defined(CONFIG_405GP) || defined(CONFIG_405EP) -#if defined(CONFIG_I2CFAST) - /* - * set bi_iic_fast for linux taking environment variable - * "i2cfast" into account - */ - { - char *s = getenv("i2cfast"); - if (s && ((*s == 'y') || (*s == 'Y'))) { - gd->bd->bi_iic_fast[0] = 1; - gd->bd->bi_iic_fast[1] = 1; - } - } -#endif /* CONFIG_I2CFAST */ -#endif /* CONFIG_405GP, CONFIG_405EP */ -#endif /* CONFIG_SYS_EXTBDINFO */ return 0; } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5cdca33f87..7cdfcd0a52 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1319,7 +1319,6 @@ CONFIG_HW_ENV_SETTINGS CONFIG_HW_WATCHDOG CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C -CONFIG_I2CFAST CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CMD_TREE CONFIG_I2C_ENV_EEPROM_BUS
This option is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: None Changes in v2: None README | 6 ------ common/board_r.c | 17 ----------------- scripts/config_whitelist.txt | 1 - 3 files changed, 24 deletions(-)