From 8c245fe7eab7b2918de6bbf2e283bced63ecc38f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 21 Apr 2021 15:32:25 -0400 Subject: [PATCH] boards: Disable CMD_SATA on platforms that no longer have a SATA driver enabled 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 --- arch/powerpc/cpu/mpc85xx/Kconfig | 11 ----------- configs/MPC8315ERDB_defconfig | 1 - configs/MPC837XERDB_SLAVE_defconfig | 2 -- 3 files changed, 14 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 06a20c881d..206ee76a50 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -153,7 +153,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 @@ -162,7 +161,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 @@ -171,7 +169,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" @@ -179,7 +176,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 @@ -188,7 +184,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 @@ -806,9 +801,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 @@ -830,9 +823,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 @@ -882,10 +873,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 f03fec92f8..1a8983584e 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 ea84564d9a..fa27cd07bb 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 @@ -121,7 +120,6 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_ADDR=0xFE080000 -CONFIG_FSL_SATA=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y