[PATCH] arm64: ls1012a: enable DM support for sata

[Priyanka Jain (OSS)]

>-----Original Message-----
>From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Peng Ma
>Sent: Friday, February 14, 2020 3:47 PM
>To: bhaskar.upadhaya at nxp.com; Rajesh Bhagat <rajesh.bhagat at nxp.com>;
>sumit.garg at nxp.com; Priyanka Jain <priyanka.jain at nxp.com>
>Cc: Andy Tang <andy.tang at nxp.com>; u-boot at lists.denx.de; Peng Ma
><peng.ma at nxp.com>
>Subject: [PATCH] arm64: ls1012a: enable DM support for sata
>
>Enable related configs to support sata DM feature.
>
>Signed-off-by: Peng Ma <peng.ma at nxp.com>
>---
> configs/ls1012a2g5rdb_qspi_defconfig         | 1 +
> configs/ls1012a2g5rdb_tfa_defconfig          | 1 +
> configs/ls1012afrdm_qspi_defconfig           | 6 ++++++
> configs/ls1012afrdm_tfa_defconfig            | 6 ++++++
> configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 2 ++
> 5 files changed, 16 insertions(+)
>
>diff --git a/configs/ls1012a2g5rdb_qspi_defconfig
>b/configs/ls1012a2g5rdb_qspi_defconfig
>index b1cf8ef7c5..ae3805ee47 100644
>--- a/configs/ls1012a2g5rdb_qspi_defconfig
>+++ b/configs/ls1012a2g5rdb_qspi_defconfig
>@@ -35,6 +35,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>CONFIG_SYS_RELOC_GD_ENV_ADDR=y  CONFIG_NET_RANDOM_ETHADDR=y
>CONFIG_DM=y
>+CONFIG_SCSI_AHCI=y
> CONFIG_SATA_CEVA=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
>diff --git a/configs/ls1012a2g5rdb_tfa_defconfig
>b/configs/ls1012a2g5rdb_tfa_defconfig
>index a978580952..8e35d0fdfd 100644
>--- a/configs/ls1012a2g5rdb_tfa_defconfig
>+++ b/configs/ls1012a2g5rdb_tfa_defconfig
>@@ -35,6 +35,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>CONFIG_SYS_RELOC_GD_ENV_ADDR=y  CONFIG_NET_RANDOM_ETHADDR=y
>CONFIG_DM=y
>+CONFIG_SCSI_AHCI=y
> CONFIG_SATA_CEVA=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
>diff --git a/configs/ls1012afrdm_qspi_defconfig
>b/configs/ls1012afrdm_qspi_defconfig
>index 11d0cee39a..2aa29deead 100644
>--- a/configs/ls1012afrdm_qspi_defconfig
>+++ b/configs/ls1012afrdm_qspi_defconfig
>@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
> CONFIG_FSL_LS_PPA=y
> CONFIG_QSPI_AHB_INIT=y
> CONFIG_NR_DRAM_BANKS=2
>+CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_FIT_VERBOSE=y
>@@ -33,8 +34,11 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>CONFIG_SYS_RELOC_GD_ENV_ADDR=y  CONFIG_NET_RANDOM_ETHADDR=y
>CONFIG_DM=y
>+CONFIG_SCSI_AHCI=y
>+CONFIG_SATA_CEVA=y
> CONFIG_DM_I2C=y
> # CONFIG_MMC is not set
>+CONFIG_DM_MMC=y
> CONFIG_MTD=y
> CONFIG_DM_SPI_FLASH=y
> # CONFIG_SPI_FLASH_BAR is not set
>@@ -47,6 +51,8 @@ CONFIG_DM_PCI=y
> CONFIG_DM_PCI_COMPAT=y
> CONFIG_PCIE_LAYERSCAPE=y
> CONFIG_DM_RTC=y
>+CONFIG_SCSI=y
>+CONFIG_DM_SCSI=y
> CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_DM_SPI=y
>diff --git a/configs/ls1012afrdm_tfa_defconfig
>b/configs/ls1012afrdm_tfa_defconfig
>index 2818bdf0d2..30deb771f2 100644
>--- a/configs/ls1012afrdm_tfa_defconfig
>+++ b/configs/ls1012afrdm_tfa_defconfig
>@@ -10,6 +10,7 @@ CONFIG_QSPI_AHB_INIT=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
> CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
>+CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_FIT_VERBOSE=y
>@@ -33,8 +34,11 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
>CONFIG_SYS_RELOC_GD_ENV_ADDR=y  CONFIG_NET_RANDOM_ETHADDR=y
>CONFIG_DM=y
>+CONFIG_SCSI_AHCI=y
>+CONFIG_SATA_CEVA=y
> CONFIG_DM_I2C=y
> # CONFIG_MMC is not set
>+CONFIG_DM_MMC=y
> CONFIG_MTD=y
> CONFIG_DM_SPI_FLASH=y
> # CONFIG_SPI_FLASH_BAR is not set
>@@ -47,6 +51,8 @@ CONFIG_DM_PCI=y
> CONFIG_DM_PCI_COMPAT=y
> CONFIG_PCIE_LAYERSCAPE=y
> CONFIG_DM_RTC=y
>+CONFIG_SCSI=y
>+CONFIG_DM_SCSI=y
> CONFIG_SYS_NS16550=y
> CONFIG_SPI=y
> CONFIG_DM_SPI=y
>diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>index 23dea4ce23..885a6e0bdf 100644
>--- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>+++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig
>@@ -9,6 +9,7 @@ CONFIG_QSPI_AHB_INIT=y
> CONFIG_NR_DRAM_BANKS=2
> CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y
> CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y
>+CONFIG_AHCI=y
> CONFIG_DISTRO_DEFAULTS=y
> # CONFIG_SYS_MALLOC_F is not set
> CONFIG_FIT_VERBOSE=y
>@@ -38,6 +39,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>CONFIG_NET_RANDOM_ETHADDR=y  CONFIG_DM=y  CONFIG_SCSI_AHCI=y
>+CONFIG_SATA_CEVA=y
> CONFIG_DM_I2C=y
> CONFIG_DM_MMC=y
> CONFIG_FSL_ESDHC=y
>--
>2.17.1

This has below build error: 

Building current source for 15 boards (2 threads, 1 job per thread)
   aarch64:  +   ls1012a2g5rdb_qspi
+In file included from include/config.h:6:0,
+                 from include/common.h:16,
+                 from lib/asm-offsets.c:14:
+include/configs/ls1012a2g5rdb.h:25:0: error: "CONFIG_LIBATA" redefined [-Werror]
+ #define CONFIG_LIBATA
+
+In file included from include/linux/kconfig.h:4:0,
+                 from <command-line>:0:
+include/generated/autoconf.h:153:0: note: this is the location of the previous definition
+ #define CONFIG_LIBATA 1
+include/configs/ls1012a2g5rdb.h:26:0: error: "CONFIG_SCSI_AHCI" redefined [-Werror]
+ #define CONFIG_SCSI_AHCI
+include/generated/autoconf.h:55:0: note: this is the location of the previous definition
+ #define CONFIG_SCSI_AHCI 1
+cc1: all warnings being treated as errors
+make[2]: *** [lib/asm-offsets.s] Error 1
+make[1]: *** [prepare0] Error 2
+make: *** [sub-make] Error 2
   aarch64:  +   ls1012a2g5rdb_tfa
+In file included from include/config.h:5:0,

Priyanka