commit e8de989c53ad1ce0af1755edd1bebac3b6528af1
author Michal Simek <michal.simek@xilinx.com> Wed Jun 01 14:29:33 2016 +0200
committer Michal Simek <michal.simek@xilinx.com> Mon Jun 06 11:23:28 2016 +0200
tree ab8220cb6b4a0b0f6d6cc55fabccb08cb3a2e0d8
parent 437c59c5d00b2946a7dd7fd61b4c4205b838d275

ARM64: zynqmp: Enable AHCI when CONFIG_SATA_CEVA is defined

Simplify zcu102 board file by moving CONFIG_AHCI enabling to common
file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

include/configs/xilinx_zynqmp.h

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 455481d..795d586 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -211,7 +211,8 @@
 # define CONFIG_SYS_EEPROM_SIZE			(64 * 1024)
 #endif
 
-#ifdef CONFIG_AHCI
+#ifdef CONFIG_SATA_CEVA
+#define CONFIG_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
 #define CONFIG_SCSI_AHCI_PLAT

include/configs/xilinx_zynqmp_zcu102.h

diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index 81079fe..09c4a51 100644
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -41,7 +41,6 @@
 #define CONFIG_CMD_PCA953X
 #define CONFIG_CMD_PCA953X_INFO
 
-#define CONFIG_AHCI
 #define CONFIG_SATA_CEVA
 
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}