Signed-off-by: Tuomas Tynkkynen tuomas.tynkkynen@iki.fi --- configs/apalis_imx6_defconfig | 1 + configs/apalis_imx6_nospl_com_defconfig | 1 + configs/apalis_imx6_nospl_it_defconfig | 1 + configs/cgtqmx6eval_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/m53evk_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/novena_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/udoo_defconfig | 1 + configs/wandboard_defconfig | 1 + drivers/ata/Kconfig | 6 ++++++ include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/m53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx6cuboxi.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/ot1200.h | 1 - include/configs/tbs2910.h | 1 - include/configs/udoo.h | 1 - include/configs/wandboard.h | 1 - scripts/config_whitelist.txt | 1 - 41 files changed, 29 insertions(+), 17 deletions(-)
diff --git configs/apalis_imx6_defconfig configs/apalis_imx6_defconfig index 2b1b34d80a..18107e88ff 100644 --- configs/apalis_imx6_defconfig +++ configs/apalis_imx6_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git configs/apalis_imx6_nospl_com_defconfig configs/apalis_imx6_nospl_com_defconfig index ddf8c8d1e3..c40e14fdf2 100644 --- configs/apalis_imx6_nospl_com_defconfig +++ configs/apalis_imx6_nospl_com_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git configs/apalis_imx6_nospl_it_defconfig configs/apalis_imx6_nospl_it_defconfig index 6eba47b8ce..5d1243ad92 100644 --- configs/apalis_imx6_nospl_it_defconfig +++ configs/apalis_imx6_nospl_it_defconfig @@ -34,6 +34,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git configs/cgtqmx6eval_defconfig configs/cgtqmx6eval_defconfig index 47c0b4c622..418e4e2d8c 100644 --- configs/cgtqmx6eval_defconfig +++ configs/cgtqmx6eval_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_PHYLIB=y diff --git configs/cm_fx6_defconfig configs/cm_fx6_defconfig index 0773aca0d4..8e0746bcf8 100644 --- configs/cm_fx6_defconfig +++ configs/cm_fx6_defconfig @@ -52,6 +52,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)" CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_DM_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y diff --git configs/dh_imx6_defconfig configs/dh_imx6_defconfig index 814df1cd27..1fd7c50e31 100644 --- configs/dh_imx6_defconfig +++ configs/dh_imx6_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_PHYLIB=y diff --git configs/dms-ba16-1g_defconfig configs/dms-ba16-1g_defconfig index cbc9e82eed..144a86bcbf 100644 --- configs/dms-ba16-1g_defconfig +++ configs/dms-ba16-1g_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git configs/dms-ba16_defconfig configs/dms-ba16_defconfig index 9be2d6cc52..075e5070f0 100644 --- configs/dms-ba16_defconfig +++ configs/dms-ba16_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y diff --git configs/gwventana_emmc_defconfig configs/gwventana_emmc_defconfig index 5379cf3b3b..b35d0914e3 100644 --- configs/gwventana_emmc_defconfig +++ configs/gwventana_emmc_defconfig @@ -53,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_E1000=y diff --git configs/gwventana_gw5904_defconfig configs/gwventana_gw5904_defconfig index fe364d07ce..6a2c196c9b 100644 --- configs/gwventana_gw5904_defconfig +++ configs/gwventana_gw5904_defconfig @@ -53,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_MV88E61XX_SWITCH=y CONFIG_MV88E61XX_CPU_PORT=5 diff --git configs/gwventana_nand_defconfig configs/gwventana_nand_defconfig index dd4d73ce9e..be6cf0cbde 100644 --- configs/gwventana_nand_defconfig +++ configs/gwventana_nand_defconfig @@ -56,6 +56,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:16m(uboot),1m(env),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_NETDEVICES=y CONFIG_E1000=y diff --git configs/m53evk_defconfig configs/m53evk_defconfig index 291144d421..845aee4730 100644 --- configs/m53evk_defconfig +++ configs/m53evk_defconfig @@ -39,6 +39,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1024k(u-boot),512k(env1),512k(env2),14m(boot),240m(data),-@2048k(UBI)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_DWC_AHSATA=y CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y diff --git configs/mx53loco_defconfig configs/mx53loco_defconfig index 3fba84c047..7471b10aa0 100644 --- configs/mx53loco_defconfig +++ configs/mx53loco_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DWC_AHSATA=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git configs/mx6cuboxi_defconfig configs/mx6cuboxi_defconfig index 0a76801219..a69a66f2e4 100644 --- configs/mx6cuboxi_defconfig +++ configs/mx6cuboxi_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_DM_THERMAL=y CONFIG_USB=y diff --git configs/mx6qsabrelite_defconfig configs/mx6qsabrelite_defconfig index 6beb52893c..c52c3923b4 100644 --- configs/mx6qsabrelite_defconfig +++ configs/mx6qsabrelite_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y diff --git configs/nitrogen6q2g_defconfig configs/nitrogen6q2g_defconfig index c25d2bf67b..d0153d4df6 100644 --- configs/nitrogen6q2g_defconfig +++ configs/nitrogen6q2g_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y diff --git configs/nitrogen6q_defconfig configs/nitrogen6q_defconfig index 65d75910b6..bf12cbde80 100644 --- configs/nitrogen6q_defconfig +++ configs/nitrogen6q_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y diff --git configs/novena_defconfig configs/novena_defconfig index 3e1f0d8814..a42ce50a2a 100644 --- configs/novena_defconfig +++ configs/novena_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git configs/ot1200_defconfig configs/ot1200_defconfig index bc37f89f48..0c3258ff1b 100644 --- configs/ot1200_defconfig +++ configs/ot1200_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_CMD_PCA953X=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git configs/ot1200_spl_defconfig configs/ot1200_spl_defconfig index 518483c5d9..ac96221ebf 100644 --- configs/ot1200_spl_defconfig +++ configs/ot1200_spl_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_CMD_PCA953X=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y diff --git configs/tbs2910_defconfig configs/tbs2910_defconfig index 1152b69c72..5adcd9d986 100644 --- configs/tbs2910_defconfig +++ configs/tbs2910_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_PCI=y CONFIG_DM_THERMAL=y diff --git configs/udoo_defconfig configs/udoo_defconfig index b92b181d4f..52cfdb009c 100644 --- configs/udoo_defconfig +++ configs/udoo_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y diff --git configs/wandboard_defconfig configs/wandboard_defconfig index 4b6b9d9aae..3c277772c0 100644 --- configs/wandboard_defconfig +++ configs/wandboard_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y +CONFIG_DWC_AHSATA=y CONFIG_PHYLIB=y CONFIG_DM_THERMAL=y CONFIG_USB=y diff --git drivers/ata/Kconfig drivers/ata/Kconfig index 2eab570b35..25ef5cef02 100644 --- drivers/ata/Kconfig +++ drivers/ata/Kconfig @@ -47,6 +47,12 @@ config DWC_AHCI Enable this driver to support Sata devices through Synopsys DWC AHCI module.
+config DWC_AHSATA + bool "Enable DWC AHSATA driver support" + help + Enable this driver to support the DWC AHSATA SATA controller found + in i.MX5 and i.MX6 SoCs. + config FSL_SATA bool "Enable Freescale SATA controller driver support" help diff --git include/configs/advantech_dms-ba16.h include/configs/advantech_dms-ba16.h index 09f470c6b5..34daf14db3 100644 --- include/configs/advantech_dms-ba16.h +++ include/configs/advantech_dms-ba16.h @@ -39,7 +39,6 @@ #define CONFIG_MXC_OCOTP
/* SATA Configs */ -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/apalis_imx6.h include/configs/apalis_imx6.h index 5a51f3c556..c32c5607d6 100644 --- include/configs/apalis_imx6.h +++ include/configs/apalis_imx6.h @@ -70,7 +70,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/cgtqmx6eval.h include/configs/cgtqmx6eval.h index 2e8993d7d4..d24d9a45f1 100644 --- include/configs/cgtqmx6eval.h +++ include/configs/cgtqmx6eval.h @@ -81,7 +81,6 @@ #define CONFIG_IMX_HDMI
/* SATA */ -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/cm_fx6.h include/configs/cm_fx6.h index da3233e965..b6164ca66d 100644 --- include/configs/cm_fx6.h +++ include/configs/cm_fx6.h @@ -211,7 +211,6 @@ #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LIBATA #define CONFIG_LBA48 -#define CONFIG_DWC_AHSATA #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
diff --git include/configs/dh_imx6.h include/configs/dh_imx6.h index 11a01d476f..b988a19646 100644 --- include/configs/dh_imx6.h +++ include/configs/dh_imx6.h @@ -84,7 +84,6 @@
/* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/ge_bx50v3.h include/configs/ge_bx50v3.h index 33f5101c14..a522120de6 100644 --- include/configs/ge_bx50v3.h +++ include/configs/ge_bx50v3.h @@ -51,7 +51,6 @@
/* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/gw_ventana.h include/configs/gw_ventana.h index 05c88b3ef8..e68ddbcc2a 100644 --- include/configs/gw_ventana.h +++ include/configs/gw_ventana.h @@ -102,7 +102,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA - #define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/m53evk.h include/configs/m53evk.h index 29eb59a3cb..c1634e53bf 100644 --- include/configs/m53evk.h +++ include/configs/m53evk.h @@ -141,7 +141,6 @@ * SATA */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR diff --git include/configs/mx53loco.h include/configs/mx53loco.h index e973b35698..0c5e9831ae 100644 --- include/configs/mx53loco.h +++ include/configs/mx53loco.h @@ -182,7 +182,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0
#ifdef CONFIG_CMD_SATA - #define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR diff --git include/configs/mx6cuboxi.h include/configs/mx6cuboxi.h index 6b42b2b3c1..392f9529de 100644 --- include/configs/mx6cuboxi.h +++ include/configs/mx6cuboxi.h @@ -23,7 +23,6 @@
/* SATA Configuration */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/nitrogen6x.h include/configs/nitrogen6x.h index b847906310..faf21cb5ae 100644 --- include/configs/nitrogen6x.h +++ include/configs/nitrogen6x.h @@ -49,7 +49,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/novena.h include/configs/novena.h index dd0e637062..736ac931e4 100644 --- include/configs/novena.h +++ include/configs/novena.h @@ -108,7 +108,6 @@
/* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/ot1200.h include/configs/ot1200.h index 55e716a22a..1146838f34 100644 --- include/configs/ot1200.h +++ include/configs/ot1200.h @@ -59,7 +59,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/tbs2910.h include/configs/tbs2910.h index 849d4a6aec..281809d87a 100644 --- include/configs/tbs2910.h +++ include/configs/tbs2910.h @@ -78,7 +78,6 @@
/* SATA */ #ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/udoo.h include/configs/udoo.h index bcce41db8a..f21ee521cc 100644 --- include/configs/udoo.h +++ include/configs/udoo.h @@ -25,7 +25,6 @@ /* SATA Configs */
#ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git include/configs/wandboard.h include/configs/wandboard.h index 97d193ba49..2155358561 100644 --- include/configs/wandboard.h +++ include/configs/wandboard.h @@ -26,7 +26,6 @@ /* SATA Configs */
#ifdef CONFIG_CMD_SATA -#define CONFIG_DWC_AHSATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt index db2e6d28f9..94b758a4dd 100644 --- scripts/config_whitelist.txt +++ scripts/config_whitelist.txt @@ -492,7 +492,6 @@ CONFIG_DWC2_ULPI_FS_LS CONFIG_DWC2_UTMI_WIDTH CONFIG_DWCDDR21MCTL CONFIG_DWCDDR21MCTL_BASE -CONFIG_DWC_AHSATA CONFIG_DWC_AHSATA_BASE_ADDR CONFIG_DWC_AHSATA_PORT_ID CONFIG_DW_ALTDESCRIPTOR