diff options
author | Simon Glass <sjg@chromium.org> | 2017-05-17 03:25:10 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-22 09:33:49 -0400 |
commit | a1dc980d88a5c9c2b99251c8d8299b0c8948de73 (patch) | |
tree | a869d56e760ac361f08e226b7eeba01bf01785aa /include/configs | |
parent | d96e8985f60ba61150b1b67b2b1ba1a540b40ca9 (diff) |
Convert CONFIG_CMD_EEPROM et al to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_EEPROM
CONFIG_CMD_EEPROM_LAYOUT
CONFIG_EEPROM_LAYOUT_HELP_STRING
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Rework Kconfig logic slightly, define EEPROM location on TI eval
platforms]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
77 files changed, 8 insertions, 97 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index e94ac5ea2c0..318a86775d0 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -702,7 +702,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index bce6229496f..87aec6a7aa0 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -228,7 +228,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000 /* I2C EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index b303b4b51b6..13e888a6f9b 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -417,7 +417,6 @@ combinations. this should be removed later #define CONFIG_SYS_EEPROM_BUS_NUM 0 /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index b8c823cc566..498c5950d00 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -371,7 +371,6 @@ /* I2C EEPROM */ /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index c3b2353f5f1..561ff894b3c 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -47,7 +47,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index deb6f826e1a..43bf127a2af 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -63,7 +63,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ #define CONFIG_CMD_IDE -#define CONFIG_CMD_EEPROM #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 30db7edde85..64c6ed100f1 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -46,7 +46,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index d782fc3cf11..ea99aead456 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -320,7 +320,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ce32f431fcb..68cc0c8718b 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -589,7 +589,6 @@ extern unsigned long get_sdram_size(void); #define MAX_NUM_PORTS 9 /* for 128Bytes EEPROM */ #endif /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/PATI.h b/include/configs/PATI.h index e53db2485b8..1b2cb3dd228 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -38,7 +38,6 @@ */ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_BOOTCOMMAND "" /* autoboot command */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 6c74b00cd59..84b1a730331 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -40,7 +40,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_PCI #define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_REGINFO #define CONFIG_CMD_FDC #define CONFIG_SCSI diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 4bb07d8bd46..74cb8abafb6 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -58,7 +58,6 @@ #define CONFIG_CMD_IRQ #define CONFIG_CMD_IDE #define CONFIG_CMD_NAND -#define CONFIG_CMD_EEPROM #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index d889306653c..2f05a5a1766 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -48,7 +48,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_PCI diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 8628b7ed188..54a1a2546fb 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -238,7 +238,6 @@ /* Partitions */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 94828931ae8..b0ea95e58a3 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -779,7 +779,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 373cb2a81c9..312eec7f15f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -789,7 +789,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 0ae9eda463d..9206fe7040e 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void); /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index df6386c6028..a90e2ac8d92 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -273,7 +273,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_REGINFO diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 7cfc351191d..ffb514bb852 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,7 +115,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 2906fcfca42..f11e23a6a35 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -129,7 +129,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index eaf07410714..e91070ae302 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -125,7 +125,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IDE /* diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index fbadcd17f1c..5255b6d688f 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -54,7 +54,6 @@ * Command line configuration. */ #define CONFIG_CMD_IRQ -#define CONFIG_CMD_EEPROM #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index b6b14d38bdd..0c6d2880daf 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -176,7 +176,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 6855f628657..2c4033ca59c 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -64,7 +64,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 1feb9468343..25f63e83114 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -23,7 +23,6 @@ #endif /* I2C Configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 6962039c3ac..b379e0839d0 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -31,6 +31,10 @@ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ +#define CONFIG_ENV_EEPROM_IS_ON_I2C +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 + #define CONFIG_SYS_OMAP_ABE_SYSCK /* Define the default GPT table for eMMC */ diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index 01406640b03..eca90cf750d 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -51,7 +51,6 @@ */ #if defined(CONFIG_440) #endif -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 40a82b884bd..34507510547 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -54,7 +54,6 @@ /* * U-Boot Commands */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IMX_FUSE /* imx iim fuse */ #define CONFIG_CMD_MTDPARTS /* MTD partition support */ #define CONFIG_CMD_NAND /* NAND support */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index c65eeedb531..fe4ac05f384 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -229,7 +229,6 @@ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 924a351c38b..71b1b96ec40 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -330,7 +330,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 30004535632..96e5c9cdd5a 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -60,8 +60,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 3 -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EEPROM_LAYOUT #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_EEPROM_SIZE 256 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index f5f3df3ad69..dd8010cd485 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -258,14 +258,10 @@ #define CONFIG_VIDEO_BMP_LOGO /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #endif /* __CONFIG_CM_FX6_H */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 9a8e1302c56..3fb9daebbc5 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -153,16 +153,12 @@ /* Status LED polarity is inversed, so init it in the "off" state */ /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #ifndef CONFIG_SPL_BUILD /* * Enable PCA9555 at I2C0-0x26. diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 4f896d26057..ee7c9de9690 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -305,14 +305,10 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "legacy, v1, v2, v3" - #endif /* __CONFIG_H */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 0df7d4269cb..dd78b0c7e89 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -257,14 +257,10 @@ #define CONFIG_OMAP3_SPI /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v1, v2, v3" - #endif /* __CONFIG_H */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 4f44a6752e6..1e63098d5f1 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -150,14 +150,10 @@ #define CONFIG_SPL_SPI_LOAD /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - #endif /* __CONFIG_CM_T43_H */ diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index ccaa5680094..14042ada7d0 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -67,16 +67,12 @@ /* Enabled commands */ /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_SYS_EEPROM_SIZE 256 -#define CONFIG_CMD_EEPROM_LAYOUT -#define CONFIG_EEPROM_LAYOUT_HELP_STRING "v2, v3" - /* USB Networking options */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 809e70dbf03..452c8aae7a6 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -185,7 +185,6 @@ #define CONFIG_PCA9698 /* NXP PCA9698 */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 9fb5cdeb5a4..2a04949ed66 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -54,7 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ /* diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 09d911374da..aa200ed5b21 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -52,7 +52,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ /* diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index a9ca0231f58..17608a54cd9 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -41,6 +41,10 @@ #define CONFIG_SYS_NS16550_COM2 UART2_BASE /* UART2 */ #define CONFIG_SYS_NS16550_COM3 UART3_BASE /* UART3 */ +#define CONFIG_ENV_EEPROM_IS_ON_I2C +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 + #define CONFIG_SYS_OMAP_ABE_SYSCK #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index fee46add809..7e03dd63ee3 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -147,7 +147,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_PCI -#undef CONFIG_CMD_EEPROM /* * PCI stuff diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 0a66720a7d2..739af03e888 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -48,7 +48,6 @@ /*********************************************************** * Command definition ***********************************************************/ -#define CONFIG_CMD_EEPROM #define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:128k(uboot)ro," \ diff --git a/include/configs/io.h b/include/configs/io.h index d4e8d56fd8f..3a535684e3c 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -54,7 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ /* diff --git a/include/configs/iocon.h b/include/configs/iocon.h index afa69942e84..379665d26b0 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -55,7 +55,6 @@ * Commands additional to the ones defined in amcc-common.h */ #define CONFIG_CMD_FPGAD -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ /* diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 872e2b3403a..506ce51236b 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -14,7 +14,6 @@ * Command line configuration. */ #define CONFIG_CMD_IMMAP -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 9e9d8795419..0737a3e2ce6 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -120,7 +120,6 @@ */ #ifdef CONFIG_CMD_I2C /* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 8-bit device address */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 2b3833d61b9..5b8500b91ba 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -61,7 +61,6 @@ /* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index f50ad429172..dc52b223cb1 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -332,7 +332,6 @@ unsigned long get_board_ddr_clk(void); /* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index d0bf5520b70..2e0d95efd74 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -278,7 +278,6 @@ unsigned long get_board_sys_clk(void); /* EEPROM */ #define CONFIG_ID_EEPROM -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_SYS_EEPROM_BUS_NUM 0 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 6893bf24ff2..f36ec3d3f8e 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -381,7 +381,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_SDRAM diff --git a/include/configs/neo.h b/include/configs/neo.h index 40a6718025f..12ac6c28bf9 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -54,7 +54,6 @@ /* * Commands additional to the ones defined in amcc-common.h */ -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ /* diff --git a/include/configs/novena.h b/include/configs/novena.h index e0ed3045865..753b59f6ecb 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -17,7 +17,6 @@ #include "mx6_common.h" /* U-Boot Commands */ -#define CONFIG_CMD_EEPROM #define CONFIG_FAT_WRITE #define CONFIG_CMD_PCI #define CONFIG_CMD_SATA diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 34da90f20b6..2052075a545 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -91,7 +91,6 @@ #define CONFIG_PHY_SMSC #ifndef CONFIG_SPL -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_BUS 1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 638e9da0283..24f751c8392 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -631,7 +631,6 @@ #define CONFIG_SYS_I2C_PCA9557_ADDR 0x18 /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 427629f409d..a6501520f55 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -230,7 +230,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PCA9555_ADDR 0x23 /* enable read and write access to EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index ea3872f5c92..fc75ca85c58 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -108,7 +108,6 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ /* I2C Configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 51b489a809b..8c0e26486ff 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_RTC_BUS_NUM 2 /* EEPROM (24FC256) */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_BUS 2 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 2cb6f56f7d0..9c8720bee9a 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -107,7 +107,6 @@ /* I2C Configuration */ #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_CMD_EEPROM #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index e208f45649c..251dd0e901b 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -12,8 +12,6 @@ #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG -#define CONFIG_CMD_EEPROM - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on VINING_FPGA */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index b37e796d337..bfd4e5fe3f8 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -279,7 +279,6 @@ /* * Command line configuration. */ -#undef CONFIG_CMD_EEPROM #define CONFIG_CMD_SDRAM #define CONFIG_CMD_REGINFO diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index ebb716ca889..0b87c9ca973 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -71,7 +71,6 @@ /* commands to include */ #define CONFIG_CMD_NAND /* NAND support */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 868464cd320..3161c50abb1 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -208,7 +208,6 @@ /* U-Boot command configuration */ #define CONFIG_CMD_SAVES #define CONFIG_CMD_UBIFS -#define CONFIG_CMD_EEPROM /* U-Boot general configuration */ #define CONFIG_MISC_INIT_R diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 799c45e2d73..0b362559f26 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_BITS 5 /* 32 Bytes */ #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS 20 -#define CONFIG_CMD_EEPROM #define CONFIG_POWER #define CONFIG_POWER_I2C diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index efc6f5abe0d..36d14ed8281 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -66,7 +66,6 @@ /* EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_BUS_NUM 1 diff --git a/include/configs/vct.h b/include/configs/vct.h index b1dccdf666f..e4ae9cdb2e8 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -77,7 +77,6 @@ /* * Commands */ -#define CONFIG_CMD_EEPROM /* * Only Premium/Platinum have ethernet support right now @@ -254,8 +253,6 @@ int vct_gpio_get(int pin); * (NOR/OneNAND) usage and Linux kernel booting. */ #if defined(CONFIG_VCT_SMALL_IMAGE) -#undef CONFIG_CMD_EEPROM -#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_IRQ #undef CONFIG_CMD_LOADY #undef CONFIG_CMD_REGINFO diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index c308f2c1a63..65db858ffb4 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -74,7 +74,6 @@ * I2C EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x56 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index c4efae67a78..efb3038d9a3 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -28,7 +28,6 @@ #define CONFIG_CMD_REGINFO #undef CONFIG_CMD_JFFS2 #undef CONFIG_CMD_MTDPARTS -#undef CONFIG_CMD_EEPROM /*Misc*/ #define CONFIG_SYS_LONGHELP /* undef to save memory */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f6def2c503d..0b3154bc618 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -184,7 +184,6 @@ /* EEPROM */ #ifdef CONFIG_ZYNQMP_EEPROM -# define CONFIG_CMD_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 8d018da23e3..4194b66c664 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -44,7 +44,6 @@ #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR} #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_EEPROM_BUS 5 #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x54 #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0x20 diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index 2a7a48d21d8..6d9500619ef 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -175,7 +175,6 @@ extern void out32(unsigned int, unsigned long); /* * Command configuration */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_PCI diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index cf84e1f99a7..4ecceb2a9f7 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index ffc0d009baf..3e21c96bc24 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index d630f2a9c9b..526bff6cff1 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index e3f0b939c3f..ee033ef01d4 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND #define CONFIG_CMD_PCA953X diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 273e276a388..30bcea1b8d3 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -145,7 +145,6 @@ /* EEPROM */ #ifdef CONFIG_ZYNQ_EEPROM -# define CONFIG_CMD_EEPROM # define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 # define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 # define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h index 1488fd8b2f7..808967cee33 100644 --- a/include/configs/zynq_zybo.h +++ b/include/configs/zynq_zybo.h @@ -14,7 +14,6 @@ #define CONFIG_ZYNQ_I2C0 #define CONFIG_ZYNQ_I2C1 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_CMD_EEPROM #define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50 #define CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET 0xFA #define CONFIG_DISPLAY |