Convert CONFIG_SPI to Kconfig
This converts the following to Kconfig:
CONFIG_SPI
This partly involves updating code that assumes that CONFIG_SPI implies
things that are specific to the MPC8xx SPI driver. For now, just update
the CONFIG tests. This also involves reworking the default for
CONFIG_SYS_DEF_EEPROM_ADDR so that we don't set it when we cannot make a
reasonable default, as it does not cause any compile failures.
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/include/common.h b/include/common.h
index 3087505..795206a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -279,19 +279,11 @@
#define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
#endif
-/*
- * Set this up regardless of board
- * type, to prevent errors.
- */
-#if defined(CONFIG_SPI) || !defined(CONFIG_SYS_I2C_EEPROM_ADDR)
-# define CONFIG_SYS_DEF_EEPROM_ADDR 0
-#else
-#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
+#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
#endif
-#endif /* CONFIG_SPI || !defined(CONFIG_SYS_I2C_EEPROM_ADDR) */
-#if defined(CONFIG_SPI)
+#if defined(CONFIG_MPC8XX_SPI)
extern void spi_init_f (void);
extern void spi_init_r (void);
extern ssize_t spi_read (uchar *, int, uchar *, int);
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 619660b..46d7ba9 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -25,10 +25,7 @@
#define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
-/* SCIF */
-
/* FLASH */
-#define CONFIG_SPI
#define CONFIG_SPI_FLASH_QUAD
/* SH Ether */
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 8c1959d..ae3213f 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -37,7 +37,6 @@
/* FLASH */
#if !defined(CONFIG_MTD_NOR_FLASH)
-#define CONFIG_SPI
#define CONFIG_SH_QSPI_BASE 0xE6B10000
#else
#define CONFIG_SYS_FLASH_CFI
diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 457f55b..2a3a1f9 100644
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -213,7 +213,6 @@
#if defined(CONFIG_SPI_BOOT)
/* McSPI IP block */
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_SPEED 24000000
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 36cf576..73a701a 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -147,7 +147,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* SPI Flash support */
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 35328b1..787025b 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -168,9 +168,6 @@
#define CONFIG_EXTRA_ENV_SETTINGS
#endif
-/* SPI */
-#define CONFIG_SPI
-
/* NAND */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_SYS_NAND_BASE 0x40000000
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 0609cca..aa54e55 100644
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -15,8 +15,6 @@
#include <configs/ti_am335x_common.h>
-#undef CONFIG_SPI
-
#undef CONFIG_MAX_RAM_BANK_SIZE
#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index a914564..ce27a88 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -127,7 +127,6 @@
#endif
#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
-#define CONFIG_SPI
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index dfbbb21..4edef66 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -57,11 +57,6 @@
#define CONFIG_DM9000_NO_SROM 1
#undef CONFIG_DM9000_DEBUG
-/* SPI */
-#undef CONFIG_SPI
-
-/* I2C */
-
/* TWL4030 */
#define CONFIG_TWL4030_LED 1
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index ce1ed5b..7d8dd09 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -55,7 +55,6 @@
#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART0_BASE /* Base address of UART0 */
#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
-#define CONFIG_SPI
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 30000000
diff --git a/include/configs/gose.h b/include/configs/gose.h
index af6189e..1f814bf 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -24,11 +24,6 @@
#define RCAR_GEN2_SDRAM_SIZE (1048u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512u * 1024 * 1024)
-/* SCIF */
-
-/* FLASH */
-#define CONFIG_SPI
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 6b2af7a..ec2162c 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -24,11 +24,6 @@
#define RCAR_GEN2_SDRAM_SIZE (2048u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
-/* SCIF */
-
-/* FLASH */
-#define CONFIG_SPI
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 3bd4d51..0d9272c 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -25,11 +25,6 @@
#define RCAR_GEN2_SDRAM_SIZE (2048u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
-/* SCIF */
-
-/* FLASH */
-#define CONFIG_SPI
-
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
#define CONFIG_SH_ETHER_PHY_ADDR 0x1
diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
index 3e5689a..0431d05 100644
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@@ -103,7 +103,6 @@
#define CONFIG_SYS_NS16550_COM1 DAVINCI_UART1_BASE /* Base address of UART1 */
#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
-#define CONFIG_SPI
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI0_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 50000000
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 1a02ff5..fbf0902 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -108,7 +108,6 @@
#ifdef SPIFLASH
# define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR
-# define CONFIG_SPI 1
# define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
# define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ
# define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index d67a619..7bdc33d 100644
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -122,7 +122,6 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#endif
-#define CONFIG_SPI
#define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE
#define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID)
#define CONFIG_SF_DEFAULT_SPEED 30000000
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 62b48bc..ffd5bcd 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -20,7 +20,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
/* SF Configs */
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_BUS 2
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 25000000
diff --git a/include/configs/porter.h b/include/configs/porter.h
index b1a4c25..ba44476 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -26,10 +26,7 @@
#define RCAR_GEN2_SDRAM_SIZE (2048u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024)
-/* SCIF */
-
/* FLASH */
-#define CONFIG_SPI
#define CONFIG_SPI_FLASH_QUAD
/* SH Ether */
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index c5ec864..ec4b88a 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -35,7 +35,6 @@
#define SDRAM_MAX_SIZE (CONFIG_NR_DRAM_BANKS * SDRAM_BANK_SIZE)
#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
#define CONFIG_SPI_FLASH_GIGADEVICE
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index c593f18..a71c6c0 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -36,7 +36,6 @@
#define SDRAM_MAX_SIZE 0x80000000
#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_SPEED 20000000
#define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index e07facd..ff6dfd5 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -44,7 +44,6 @@
#define SDRAM_MAX_SIZE 0x80000000
#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_SPEED 20000000
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 23dbfec..d95254b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -47,7 +47,6 @@
#define SDRAM_MAX_SIZE 0xfe000000
#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_SPEED 20000000
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 517d058..09b5036 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -33,7 +33,6 @@
#define SDRAM_MAX_SIZE 0xff000000
#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_SPEED 20000000
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 46f4800..a608214 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -117,8 +117,6 @@
#define CONFIG_VIDEO_BMP_LOGO
#define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE
-#define CONFIG_SPI
-
#define BOARD_LCD_RESET 115 /* Bank 3 pin 19 */
#define CONFIG_FORMIKE
#define DISPL_PLL_SPREAD_SPECTRUM
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 13c3dc8..2062647 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -62,7 +62,6 @@
#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
-#define CONFIG_SPI
#define CONFIG_MTD_DEVICE
#define CONFIG_SF_DEFAULT_SPEED (75000000)
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 5f351b5..465291f 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -26,10 +26,7 @@
#define RCAR_GEN2_SDRAM_SIZE (1024u * 1024 * 1024)
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)
-/* SCIF */
-
/* FLASH */
-#define CONFIG_SPI
#define CONFIG_SPI_FLASH_QUAD
/* SH Ether */
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 228cb55..22e23eb 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -31,7 +31,6 @@
#define CONFIG_SCIF_A
/* SPI */
-#define CONFIG_SPI
#define CONFIG_SPI_FLASH_QUAD
/* SH Ether */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 2fa0ded..3112231 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -117,7 +117,6 @@
#endif
/* SPI EEPROM */
-#define CONFIG_SPI
#define TAURUS_SPI_MASK (1 << 4)
#define TAURUS_SPI_CS_PIN AT91_PIN_PA3
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 4771e74..18cd6af 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -98,11 +98,6 @@
#define CONFIG_DM_I2C_COMPAT
#endif
-/* McSPI IP block */
-#define CONFIG_SPI
-
-/* GPIO block */
-
/*
* The following are general good-enough settings for U-Boot. We set a
* large malloc pool as we generally have a lot of DDR, and we opt for
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 6d650b7..5c71168 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -87,11 +87,6 @@
#define CONFIG_ENV_OVERWRITE
/*-----------------------------------------------------------------------
- * FLASH configuration
- */
-#define CONFIG_SPI
-
-/*-----------------------------------------------------------------------
* Environment configuration
*/
#define CONFIG_ENV_SIZE 0x01000