Skip to contentSkip to conversation

arm64: zynqmp: mmc: Moved mmc u-boot headers to the Kconfig

PATCH New Vipul Kumar 2 participants 4 messages Feb 22, 2018 – Feb 26, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover arm64: zynqmp: mmc: Moved mmc u-boot headers to the Kconfig

This series of patch moved mmc u-boot headers to the Kconfig and enabled it in respective defconfig.

These are the configs:
-CONFIG_ZYNQ_SDHCI0
-CONFIG_ZYNQ_SDHCI1

Vipul Kumar (2):
arm64: zynqmp: mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI0
arm64: zynqmp: mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI1

 arch/arm/cpu/armv8/zynqmp/Kconfig                | 10 ++++++++++
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  2 ++
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig |  1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    |  1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      |  1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      |  1 +
 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h |  2 --
 include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h |  1 -
 include/configs/xilinx_zynqmp_zcu102.h           |  1 -
 9 files changed, 16 insertions(+), 4 deletions(-)

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#1 lore raw

PATCH 1/2 arm64: zynqmp: mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI0

This patch added Kconfig support for CONFIG_ZYNQ_SDHCI0 and enabled it in respective defconfig.

---
 arch/arm/cpu/armv8/zynqmp/Kconfig                | 5 +++++
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 1 -
 include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 1 -
 5 files changed, 7 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +5 -0
index 9e521ed..f32ced7 100644
@@ -89,6 +89,11 @@ config ZYNQMP_PSU_INIT_ENABLED
        help
          Include psu_init to full u-boot. SPL include psu_init by default.
 
+config ZYNQ_SDHCI0
+       bool "Xilinx SDHCI0 controller"
+       help
+         Enable the SDHCI0 controller for Xilinx ZynqMP.
+
 config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
        bool "Overwrite SPL bootmode"
        depends on SPL
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index 7da0ca8..05d98c0 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm015 dc1"
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_SDHCI0=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index ac565ec..403cb7c 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm019 dc5"
+CONFIG_ZYNQ_SDHCI0=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5"
 CONFIG_DEBUG_UART=y
 CONFIG_DISTRO_DEFAULTS=y
include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +0 -1
index e3797a8..7bcefad 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
 #define __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
 
-#define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_SDHCI1
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
 
include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h +0 -1
index 6a0e397..5aaf6c0 100644
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
 #define __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
 
-#define CONFIG_ZYNQ_SDHCI0
 
 #include <configs/xilinx_zynqmp.h>
 

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

#2 lore raw

PATCH 1/2 arm64: zynqmp: mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI0

Quoted 18 lines · Vipul Kumar

This patch added Kconfig support for CONFIG_ZYNQ_SDHCI0 and enabled it in respective defconfig.

---
 arch/arm/cpu/armv8/zynqmp/Kconfig                | 5 +++++
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 1 -
 include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h | 1 -
 5 files changed, 7 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +0 -0
index 9e521ed..f32ced7 100644

arch/arm/cpu/armv8/zynqmp/Kconfig config ZYNQMP_PSU_INIT_ENABLED · line 93

Quoted 5 lines
arch/arm/cpu/armv8/zynqmp/Kconfig +2 -0
@@ -89,6 +89,11 @@ config ZYNQMP_PSU_INIT_ENABLED
 	help
 	  Include psu_init to full u-boot. SPL include psu_init by default.
 
+config ZYNQ_SDHCI0
+	bool "Xilinx SDHCI0 controller"

Missing dependency on MMC_SDHCI_ZYNQ.

The same for patch 2.

M

Quoted 55 lines
arch/arm/cpu/armv8/zynqmp/Kconfig +3 -0
+	help
+	  Enable the SDHCI0 controller for Xilinx ZynqMP.
+
 config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
 	bool "Overwrite SPL bootmode"
 	depends on SPL
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index 7da0ca8..05d98c0 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm015 dc1"
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_SDHCI0=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +1 -0
index ac565ec..403cb7c 100644
@@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQMP=y
 CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm019 dc5"
+CONFIG_ZYNQ_SDHCI0=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5"
 CONFIG_DEBUG_UART=y
 CONFIG_DISTRO_DEFAULTS=y
include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +0 -1
index e3797a8..7bcefad 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
 #define __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
 
-#define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_SDHCI1
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
 
include/configs/xilinx_zynqmp_zc1751_xm019_dc5.h +0 -1
index 6a0e397..5aaf6c0 100644
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
 #define __CONFIG_ZYNQMP_ZC1751_XM019_DC5_H
 
-#define CONFIG_ZYNQ_SDHCI0
 
 #include <configs/xilinx_zynqmp.h>
 
#3 lore raw

PATCH 2/2 arm64: zynqmp: mmc: Added Kconfig support for CONFIG_ZYNQ_SDHCI1

In reply to Vipul Kumar

This patch added Kconfig support for CONFIG_ZYNQ_SDHCI1 and enabled it in defconfig.

---
 arch/arm/cpu/armv8/zynqmp/Kconfig                | 5 +++++
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_rev1_0_defconfig    | 1 +
 configs/xilinx_zynqmp_zcu102_revA_defconfig      | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h | 1 -
 include/configs/xilinx_zynqmp_zcu102.h           | 1 -
 7 files changed, 9 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/zynqmp/Kconfig +5 -0
index f32ced7..0587187 100644
@@ -94,6 +94,11 @@ config ZYNQ_SDHCI0
        help
          Enable the SDHCI0 controller for Xilinx ZynqMP.
 
+config ZYNQ_SDHCI1
+       bool "Xilinx SDHCI1 controller"
+       help
+         Enable the SDHCI1 controller for Xilinx ZynqMP.
+
 config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
        bool "Overwrite SPL bootmode"
        depends on SPL
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0
index 05d98c0..be0e37f 100644
@@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm015 dc1"
 CONFIG_ZYNQMP_USB=y
 CONFIG_ZYNQ_SDHCI0=y
+CONFIG_ZYNQ_SDHCI1=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig +1 -0
index d0a1467..9d6f1a0 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 rev1.0"
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_SDHCI1=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
configs/xilinx_zynqmp_zcu102_revA_defconfig +1 -0
index ecefb00..e5f7686 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 revA"
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_SDHCI1=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revA"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0
index c2add99..0cdd621 100644
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000
 CONFIG_SYS_MALLOC_F_LEN=0x8000
 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102 revB"
 CONFIG_ZYNQMP_USB=y
+CONFIG_ZYNQ_SDHCI1=y
 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB"
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h +0 -1
index 7bcefad..a415569 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
 #define __CONFIG_ZYNQMP_ZC1751_XM015_DC1_H
 
-#define CONFIG_ZYNQ_SDHCI1
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
 
 #include <configs/xilinx_zynqmp.h>
include/configs/xilinx_zynqmp_zcu102.h +0 -1
index 85f78ba..c5b7e9a 100644
@@ -10,7 +10,6 @@
 #ifndef __CONFIG_ZYNQMP_ZCU102_H
 #define __CONFIG_ZYNQMP_ZCU102_H
 
-#define CONFIG_ZYNQ_SDHCI1
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_MAX_HOPS                1

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.