aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-07 02:42:19 +0200
committerTom Rini <trini@konsulko.com>2018-02-13 23:01:44 -0500
commit60e54562913f7a272a5483ed909cf9c740b606f6 (patch)
tree39d5c67ffebd97f769fbe1e172b1f67a0e4d142a /include
parent7b819b569e92fd9b9b1baf160cd946a523fde1ce (diff)
downloadu-boot-60e54562913f7a272a5483ed909cf9c740b606f6.zip
u-boot-60e54562913f7a272a5483ed909cf9c740b606f6.tar.gz
u-boot-60e54562913f7a272a5483ed909cf9c740b606f6.tar.bz2
spi: Migrate CONFIG_MXC_SPI to Kconfig
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/advantech_dms-ba16.h1
-rw-r--r--include/configs/aristainetos-common.h1
-rw-r--r--include/configs/cgtqmx6eval.h1
-rw-r--r--include/configs/cl-som-imx7.h1
-rw-r--r--include/configs/cm_fx6.h1
-rw-r--r--include/configs/dh_imx6.h1
-rw-r--r--include/configs/display5.h1
-rw-r--r--include/configs/el6x_common.h1
-rw-r--r--include/configs/embestmx6boards.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/ge_bx50v3.h1
-rw-r--r--include/configs/gw_ventana.h1
-rw-r--r--include/configs/imx31_phycore.h1
-rw-r--r--include/configs/mccmon6.h1
-rw-r--r--include/configs/mx31ads.h1
-rw-r--r--include/configs/mx31pdk.h1
-rw-r--r--include/configs/mx35pdk.h1
-rw-r--r--include/configs/mx51evk.h6
-rw-r--r--include/configs/mx6sabre_common.h1
-rw-r--r--include/configs/mx6slevk.h1
-rw-r--r--include/configs/nitrogen6x.h1
-rw-r--r--include/configs/ot1200.h1
-rw-r--r--include/configs/pcm058.h1
-rw-r--r--include/configs/pfla02.h1
-rw-r--r--include/configs/tqma6.h3
-rw-r--r--include/configs/tqma6_wru4.h6
-rw-r--r--include/configs/ts4800.h1
-rw-r--r--include/configs/woodburn_common.h1
28 files changed, 0 insertions, 40 deletions
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 89d4eee..e7fb60b 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -68,7 +68,6 @@
/* Serial Flash */
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 69de44a..e730601 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -33,7 +33,6 @@
#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_SPI_FLASH_MTD
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_SPEED 20000000
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
#define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN
diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index f493026..afc0bae 100644
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -38,7 +38,6 @@
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_STMICRO
#define CONFIG_SPI_FLASH_SST
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0)
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 14c4712..7d6f39f 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -148,7 +148,6 @@
/* SPI Flash support */
#define CONFIG_SPI
-#define CONFIG_MXC_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 39d166a..72610d6 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -175,7 +175,6 @@
/* SPI */
#define CONFIG_SPI
-#define CONFIG_MXC_SPI
/* NAND */
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 277e89a..82bc511 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -89,7 +89,6 @@
/* SPI Flash Configs */
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 25000000
diff --git a/include/configs/display5.h b/include/configs/display5.h
index c41ab8b..9c8a836 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -65,7 +65,6 @@
/* SPI NOR Flash */
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 1
#define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(5, 29) << 8))
#define CONFIG_SF_DEFAULT_SPEED 50000000
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 909981c..89d3dff 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -46,7 +46,6 @@
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
/* Commands */
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 3
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 08a2922..1d9e33a 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -52,7 +52,6 @@
#define CONFIG_PHY_ATHEROS
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index eaaaed9..95a1260 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -46,7 +46,6 @@
#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
#define CONFIG_SYS_SPD_BUS_NUM 2 /* I2C3 */
#define CONFIG_SYS_MXC_I2C3_SLAVE 0xfe
-#define CONFIG_MXC_SPI
/*
* UART (console)
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 7caaa0f..f1c3a51 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -92,7 +92,6 @@
/* Serial Flash */
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 6e994b5..4845c9f 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -54,7 +54,6 @@
/* SPI */
#ifdef CONFIG_CMD_SF
- #define CONFIG_MXC_SPI
#define CONFIG_SPI_FLASH_MTD
#define CONFIG_SPI_FLASH_BAR
#define CONFIG_SF_DEFAULT_BUS 0
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index b2d65f1..c5357244 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -147,7 +147,6 @@
/* EET platform additions */
#ifdef CONFIG_TARGET_IMX31_PHYCORE_EET
#define CONFIG_HARD_SPI
-#define CONFIG_MXC_SPI
#define CONFIG_S6E63D6
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 0cb8b17..ed5f53f 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -45,7 +45,6 @@
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 2
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 25000000
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 3fed107..358095d 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -33,7 +33,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_HARD_SPI 1
-#define CONFIG_MXC_SPI 1
#define CONFIG_DEFAULT_SPI_BUS 1
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index c704e62..f970d81 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -47,7 +47,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_HARD_SPI
-#define CONFIG_MXC_SPI
#define CONFIG_DEFAULT_SPI_BUS 1
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 7e000c0..ca5f2fc 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -40,7 +40,6 @@
#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
-#define CONFIG_MXC_SPI
/*
* PMIC Configs
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index b3e8b8c..5541d26 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -36,12 +36,6 @@
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
-/*
- * SPI Configs
- * */
-
-#define CONFIG_MXC_SPI
-
/* PMIC Controller */
#define CONFIG_POWER
#define CONFIG_POWER_SPI
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 8b37404..d976e77 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -31,7 +31,6 @@
#define CONFIG_PHY_ATHEROS
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 9ddb143..aa29520 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -148,7 +148,6 @@
#endif
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 57cdfd4..c73cfb7 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -25,7 +25,6 @@
#define CONFIG_MXC_UART_BASE UART2_BASE
#ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 25000000
diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 051416e..b2cbf91 100644
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -21,7 +21,6 @@
/* SF Configs */
#define CONFIG_SPI
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 2
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 25000000
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index ec74ed7..3ea0462 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -44,7 +44,6 @@
#define CONFIG_FEC_MXC_PHYADDR 3
/* SPI Flash */
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 2001d5d..dc20b85 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -41,7 +41,6 @@
#define CONFIG_FEC_MXC_PHYADDR 3
/* SPI Flash */
-#define CONFIG_MXC_SPI
#define CONFIG_SF_DEFAULT_BUS 2
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 20000000
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 591802a..1a1f5e3 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -31,9 +31,6 @@
#define CONFIG_MXC_UART
-/* SPI */
-#define CONFIG_MXC_SPI
-
/* SPI Flash */
#define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 4e99cdb..cb0b9ee 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -38,10 +38,4 @@
#define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_BOOTCOUNT_BE
-/*
- * Remove all unused interfaces / commands that are defined in
- * the common header tqms6.h
- */
-#undef CONFIG_MXC_SPI
-
#endif /* __CONFIG_TQMA6_WRU4_H */
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 3ee1477..e41dce3 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -47,7 +47,6 @@
* SPI Configs
* */
#define CONFIG_HARD_SPI /* puts SPI: ready */
-#define CONFIG_MXC_SPI /* driver for the SPI controllers*/
/*
* MMC Configs
diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 5b94a3f..a81d934 100644
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -43,7 +43,6 @@
#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
#define CONFIG_SYS_SPD_BUS_NUM 0
-#define CONFIG_MXC_SPI
/* PMIC Controller */
#define CONFIG_POWER