[U-Boot] [PATCH 1/2] sandbox: Migrate CONFIG_I2C_EEPROM
Most users of CONFIG_I2C_EEPROM were migrated to defconfig a while ago, but sandbox was skipped. Leave it off for sandbox_spl where it does not build, but does not need to be either.
Cc: Simon Glass sjg@chromium.org Signed-off-by: Tom Rini trini@konsulko.com --- configs/sandbox_defconfig | 1 + include/configs/sandbox.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 6a1874a..89ebe92 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -101,6 +101,7 @@ CONFIG_CROS_EC_SPI=y CONFIG_PWRSEQ=y CONFIG_SPL_PWRSEQ=y CONFIG_SYSRESET=y +CONFIG_I2C_EEPROM=y CONFIG_DM_MMC_OPS=y CONFIG_SANDBOX_MMC=y CONFIG_SPI_FLASH_SANDBOX=y diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 197d8bb8..94e024b 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -85,7 +85,6 @@ #define CONFIG_CMD_SF_TEST
#define CONFIG_I2C_EDID -#define CONFIG_I2C_EEPROM
/* Memory things - we don't really want a memory test */ #define CONFIG_SYS_LOAD_ADDR 0x00000000
This option was set in the main uniphier config file, but was not causing the driver to be built, so we just drop the line here.
Cc: Masahiro Yamada yamada.masahiro@socionext.com Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/uniphier.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 169c197..e485583 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -9,7 +9,6 @@ #ifndef __CONFIG_UNIPHIER_COMMON_H__ #define __CONFIG_UNIPHIER_COMMON_H__
-#define CONFIG_I2C_EEPROM #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_SMC911X
Hi Tom,
2016-07-26 7:21 GMT+09:00 Tom Rini trini@konsulko.com:
This option was set in the main uniphier config file, but was not causing the driver to be built, so we just drop the line here.
This option is actually causing drivers/misc/i2c_eeprom.o built, and I really need it.
yamada@beagle:~/workspace/u-boot$ make uniphier_pro4_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # yamada@beagle:~/workspace/u-boot$ make CROSS_COMPILE=arm-linux-gnueabi- scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h UPD include/config.h [snip]
CC drivers/misc/i2c_eeprom.o LD drivers/misc/built-in.o
Could you move the config to Kconfig rather than removing it, please?
On Tue, Jul 26, 2016 at 11:07:02AM +0900, Masahiro Yamada wrote:
Hi Tom,
2016-07-26 7:21 GMT+09:00 Tom Rini trini@konsulko.com:
This option was set in the main uniphier config file, but was not causing the driver to be built, so we just drop the line here.
This option is actually causing drivers/misc/i2c_eeprom.o built, and I really need it.
Interesting. I tried uniphier_ld4_sld8 and it was not. And moveconfig.py also didn't see it needed.
[snip]
Could you move the config to Kconfig rather than removing it, please?
I'll drop this patch and now that you're aware of it, let you handle it. Especially since moveconfig.py isn't seeing it :) Thanks!
Hi Tom,
2016-07-26 11:23 GMT+09:00 Tom Rini trini@konsulko.com:
On Tue, Jul 26, 2016 at 11:07:02AM +0900, Masahiro Yamada wrote:
Hi Tom,
2016-07-26 7:21 GMT+09:00 Tom Rini trini@konsulko.com:
This option was set in the main uniphier config file, but was not causing the driver to be built, so we just drop the line here.
This option is actually causing drivers/misc/i2c_eeprom.o built, and I really need it.
Interesting. I tried uniphier_ld4_sld8 and it was not.
It is.
masahiro@grover:~/workspace/u-boot$ make mrproper masahiro@grover:~/workspace/u-boot$ git describe v2016.09-rc1 masahiro@grover:~/workspace/u-boot$ make uniphier_ld4_sld8_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # masahiro@grover:~/workspace/u-boot$ make CROSS_COMPILE=arm-linux-gnueabi- scripts/kconfig/conf --silentoldconfig Kconfig [ snip ] LD drivers/memory/built-in.o CC drivers/misc/i2c_eeprom.o LD drivers/misc/built-in.o
And moveconfig.py also didn't see it needed.
This is correct behavior.
config I2C_EEPROM bool "Enable driver for generic I2C-attached EEPROMs" depends on MISC
This option depends on "MISC". So, it is invisible unless MISC is defined.
[snip]
Could you move the config to Kconfig rather than removing it, please?
I'll drop this patch and now that you're aware of it, let you handle it. Especially since moveconfig.py isn't seeing it :) Thanks!
I handled it. http://patchwork.ozlabs.org/patch/652880/
It is a trivial move, could you pick it up directly to u-boot/master?
On Wed, Jul 27, 2016 at 03:54:31AM +0900, Masahiro Yamada wrote:
Hi Tom,
2016-07-26 11:23 GMT+09:00 Tom Rini trini@konsulko.com:
On Tue, Jul 26, 2016 at 11:07:02AM +0900, Masahiro Yamada wrote:
Hi Tom,
2016-07-26 7:21 GMT+09:00 Tom Rini trini@konsulko.com:
This option was set in the main uniphier config file, but was not causing the driver to be built, so we just drop the line here.
This option is actually causing drivers/misc/i2c_eeprom.o built, and I really need it.
Interesting. I tried uniphier_ld4_sld8 and it was not.
It is.
masahiro@grover:~/workspace/u-boot$ make mrproper masahiro@grover:~/workspace/u-boot$ git describe v2016.09-rc1 masahiro@grover:~/workspace/u-boot$ make uniphier_ld4_sld8_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # masahiro@grover:~/workspace/u-boot$ make CROSS_COMPILE=arm-linux-gnueabi- scripts/kconfig/conf --silentoldconfig Kconfig [ snip ] LD drivers/memory/built-in.o CC drivers/misc/i2c_eeprom.o LD drivers/misc/built-in.o
I'm confused because I both can't replicate my problem but know I checked in drivers/misc for output (I use O= always).
And moveconfig.py also didn't see it needed.
This is correct behavior.
config I2C_EEPROM bool "Enable driver for generic I2C-attached EEPROMs" depends on MISC
This option depends on "MISC". So, it is invisible unless MISC is defined.
Ah, but I was expecting some sort of failure message from moveconfig.py as the option didn't get moved. I don't know how expensive it would be, if possible, to detect this kind of failure however.
[snip]
Could you move the config to Kconfig rather than removing it, please?
I'll drop this patch and now that you're aware of it, let you handle it. Especially since moveconfig.py isn't seeing it :) Thanks!
I handled it. http://patchwork.ozlabs.org/patch/652880/
It is a trivial move, could you pick it up directly to u-boot/master?
OK, will do.
-- Best Regards Masahiro Yamada
Hi Tom,
I'm confused because I both can't replicate my problem but know I checked in drivers/misc for output (I use O= always).
I have no idea.
I tried with O= and drivers/misc/i2c_eeprom.o was built as well.
And moveconfig.py also didn't see it needed.
This is correct behavior.
config I2C_EEPROM bool "Enable driver for generic I2C-attached EEPROMs" depends on MISC
This option depends on "MISC". So, it is invisible unless MISC is defined.
Ah, but I was expecting some sort of failure message from moveconfig.py as the option didn't get moved. I don't know how expensive it would be, if possible, to detect this kind of failure however.
The tool will show as follows:
uniphier_ld4_sld8_defconfig CONFIG_I2C_EEPROM is not defined in Kconfig. Do nothing.
This is the message.
- CONFIG_... is not defined in Kconfig. Do nothing. The entry for this CONFIG was not found in Kconfig. There are two common cases: - You forgot to create an entry for the CONFIG before running this tool, or made a typo in a CONFIG passed to this tool. - The entry was hidden due to unmet 'depends on'. This is correct behavior.
As the document says, moveconfig.py cannot know whether it was hidden by unmet "depends on" or it had really no entry.
On Wed, Jul 27, 2016 at 03:42:40PM +0900, Masahiro Yamada wrote:
[snip]
The tool will show as follows:
uniphier_ld4_sld8_defconfig CONFIG_I2C_EEPROM is not defined in Kconfig. Do nothing.
This is the message.
- CONFIG_... is not defined in Kconfig. Do nothing. The entry for this CONFIG was not found in Kconfig. There are two common cases:
- You forgot to create an entry for the CONFIG before running this tool, or made a typo in a CONFIG passed to this tool.
- The entry was hidden due to unmet 'depends on'. This is correct behavior.
As the document says, moveconfig.py cannot know whether it was hidden by unmet "depends on" or it had really no entry.
OK, I think we should make this a much louder and fatal type error. In both cases, the move did not happen as instructed. Is there some way to tell moveconfig that CONFIG_X depends on CONFIG_Y, or would that too start making things too complicated?
On Mon, Jul 25, 2016 at 06:21:41PM -0400, Tom Rini wrote:
Most users of CONFIG_I2C_EEPROM were migrated to defconfig a while ago, but sandbox was skipped. Leave it off for sandbox_spl where it does not build, but does not need to be either.
Cc: Simon Glass sjg@chromium.org Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On 25 July 2016 at 16:21, Tom Rini trini@konsulko.com wrote:
Most users of CONFIG_I2C_EEPROM were migrated to defconfig a while ago, but sandbox was skipped. Leave it off for sandbox_spl where it does not build, but does not need to be either.
Cc: Simon Glass sjg@chromium.org Signed-off-by: Tom Rini trini@konsulko.com
configs/sandbox_defconfig | 1 + include/configs/sandbox.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
participants (3)
-
Masahiro Yamada -
Simon Glass -
Tom Rini