diff mbox series

[14/16] boards: Disable CMD_SATA on platforms that no longer have a SATA driver enabled

Message ID 20210210024257.20193-14-trini@konsulko.com
State Superseded
Delegated to: Tom Rini
Headers show
Series [01/16] ls1012aqds_tfa_SECURE_BOOT: Remove unused CONFIG_SCSI_AHCI | expand

Commit Message

Tom Rini Feb. 10, 2021, 2:42 a.m. UTC 
There are a number of platforms that depend on a SATA driver that has
been converted to require AHCI but the platforms themselves are behind
on other migrations that would make it trivial to enable AHCI.  Disable
SATA in these cases.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/powerpc/cpu/mpc83xx/Kconfig              |  2 --
 arch/powerpc/cpu/mpc85xx/Kconfig              | 20 -------------------
 configs/MPC8315ERDB_defconfig                 |  1 -
 configs/MPC837XERDB_SLAVE_defconfig           |  1 -
 configs/MPC837XERDB_defconfig                 |  1 -
 configs/cgtqmx6eval_defconfig                 |  1 -
 ...trolcenterd_36BIT_SDCARD_DEVELOP_defconfig |  1 -
 configs/controlcenterd_36BIT_SDCARD_defconfig |  1 -
 configs/udoo_defconfig                        |  1 -
 include/configs/udoo.h                        |  1 -
 10 files changed, 30 deletions(-)
diff mbox series

Patch

diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index f34acf7fa7f5..b19c3cefabab 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -79,8 +79,6 @@  config TARGET_MPC837XEMDS
 	bool "Support MPC837XEMDS"
 	select ARCH_MPC837X
 	select BOARD_EARLY_INIT_F
-	imply CMD_SATA
-	imply FSL_SATA
 
 config TARGET_MPC837XERDB
 	bool "Support MPC837XERDB"
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 870ab800e86b..4d3d310d07b4 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -45,7 +45,6 @@  config TARGET_P5040DS
 	select PHYS_64BIT
 	select ARCH_P5040
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_MPC8541CDS
@@ -75,7 +74,6 @@  config TARGET_P1010RDB_PA
 	select SUPPORT_SPL
 	select SUPPORT_TPL
 	imply CMD_EEPROM
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_P1010RDB_PB
@@ -85,7 +83,6 @@  config TARGET_P1010RDB_PB
 	select SUPPORT_SPL
 	select SUPPORT_TPL
 	imply CMD_EEPROM
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_P1020RDB_PC
@@ -154,7 +151,6 @@  config TARGET_T1040RDB
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
 	select SUPPORT_SPL
 	select PHYS_64BIT
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_T1040D4RDB
@@ -163,7 +159,6 @@  config TARGET_T1040D4RDB
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
 	select SUPPORT_SPL
 	select PHYS_64BIT
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_T1042RDB
@@ -172,7 +167,6 @@  config TARGET_T1042RDB
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
 	select SUPPORT_SPL
 	select PHYS_64BIT
-	imply CMD_SATA
 
 config TARGET_T1042D4RDB
 	bool "Support T1042D4RDB"
@@ -180,7 +174,6 @@  config TARGET_T1042D4RDB
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
 	select SUPPORT_SPL
 	select PHYS_64BIT
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_T1042RDB_PI
@@ -189,7 +182,6 @@  config TARGET_T1042RDB_PI
 	select BOARD_LATE_INIT if CHAIN_OF_TRUST
 	select SUPPORT_SPL
 	select PHYS_64BIT
-	imply CMD_SATA
 	imply PANIC_HANG
 
 config TARGET_T2080QDS
@@ -528,10 +520,8 @@  config ARCH_P1010
 	imply CMD_EEPROM
 	imply CMD_MTDPARTS
 	imply CMD_NAND
-	imply CMD_SATA
 	imply CMD_PCI
 	imply CMD_REGINFO
-	imply FSL_SATA
 
 config ARCH_P1011
 	bool
@@ -791,9 +781,7 @@  config ARCH_P5020
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_PPC64
 	select FSL_ELBC
-	imply CMD_SATA
 	imply CMD_REGINFO
-	imply FSL_SATA
 
 config ARCH_P5040
 	bool
@@ -816,9 +804,7 @@  config ARCH_P5040
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_PPC64
 	select FSL_ELBC
-	imply CMD_SATA
 	imply CMD_REGINFO
-	imply FSL_SATA
 
 config ARCH_QEMU_E500
 	bool
@@ -886,9 +872,7 @@  config ARCH_T1040
 	select FSL_IFC
 	imply CMD_MTDPARTS
 	imply CMD_NAND
-	imply CMD_SATA
 	imply CMD_REGINFO
-	imply FSL_SATA
 
 config ARCH_T1042
 	bool
@@ -910,9 +894,7 @@  config ARCH_T1042
 	select FSL_IFC
 	imply CMD_MTDPARTS
 	imply CMD_NAND
-	imply CMD_SATA
 	imply CMD_REGINFO
-	imply FSL_SATA
 
 config ARCH_T2080
 	bool
@@ -985,10 +967,8 @@  config ARCH_T4160
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_PPC64
 	select FSL_IFC
-	imply CMD_SATA
 	imply CMD_NAND
 	imply CMD_REGINFO
-	imply FSL_SATA
 
 config ARCH_T4240
 	bool
diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig
index f03fec92f867..1a8983584e9e 100644
--- a/configs/MPC8315ERDB_defconfig
+++ b/configs/MPC8315ERDB_defconfig
@@ -118,7 +118,6 @@  CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_PCI=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
diff --git a/configs/MPC837XERDB_SLAVE_defconfig b/configs/MPC837XERDB_SLAVE_defconfig
index ea84564d9af8..388779bec1c3 100644
--- a/configs/MPC837XERDB_SLAVE_defconfig
+++ b/configs/MPC837XERDB_SLAVE_defconfig
@@ -111,7 +111,6 @@  CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig
index 0d8ec8e9cafd..4c3076bb54b6 100644
--- a/configs/MPC837XERDB_defconfig
+++ b/configs/MPC837XERDB_defconfig
@@ -152,7 +152,6 @@  CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index 26f74662f80a..e92dcb637c8d 100644
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -37,7 +37,6 @@  CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 41785d09d0fc..4414563f1875 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -24,7 +24,6 @@  CONFIG_CMD_EEPROM=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 777f5aee41f8..24f7a8dbffeb 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -24,7 +24,6 @@  CONFIG_CMD_EEPROM=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_MII=y
diff --git a/configs/udoo_defconfig b/configs/udoo_defconfig
index f72b9645dac3..d70a6ca41ce1 100644
--- a/configs/udoo_defconfig
+++ b/configs/udoo_defconfig
@@ -24,7 +24,6 @@  CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
-CONFIG_CMD_SATA=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_ENV_OVERWRITE=y
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index b4fbf8c6383d..e250c7e9d922 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -65,7 +65,6 @@ 
 
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
-	func(SATA, sata, 0) \
 	func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>