Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[people/ms/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e5f57efa492c07a26fe01bcfee693a7f1a87aa36..d1c3157b7958afbab28d0d86cbcbbe97f4731417 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,6 +7,10 @@ config SYS_ARCH
 config ARM64
        bool
 
+config DMA_ADDR_T_64BIT
+       bool
+       default y if ARM64
+
 config HAS_VBAR
         bool
 
@@ -111,7 +115,7 @@ config KIRKWOOD
        select CPU_ARM926EJS
 
 config ARCH_MVEBU
-       bool "Marvell MVEBU family (Armada XP/38x)"
+       bool "Marvell MVEBU family (Armada XP/375/38x)"
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL
@@ -507,6 +511,16 @@ config RMOBILE
        bool "Renesas ARM SoCs"
        select CPU_V7
 
+config ARCH_SNAPDRAGON
+       bool "Qualcomm Snapdragon SoCs"
+       select ARM64
+       select DM
+       select DM_GPIO
+       select DM_SERIAL
+       select SPMI
+       select OF_CONTROL
+       select OF_SEPARATE
+
 config ARCH_SOCFPGA
        bool "Altera SOCFPGA family"
        select CPU_V7
@@ -524,6 +538,7 @@ config TARGET_CM_T43
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
+       select CMD_GPIO
        select CMD_USB
        select DM
        select DM_ETH
@@ -531,10 +546,11 @@ config ARCH_SUNXI
        select DM_KEYBOARD
        select DM_SERIAL
        select DM_USB
+       select OF_BOARD_SETUP
        select OF_CONTROL
        select OF_SEPARATE
-       select SPL_STACK_R if !MACH_SUN9I
-       select SPL_SYS_MALLOC_SIMPLE if !MACH_SUN9I
+       select SPL_STACK_R if SUPPORT_SPL
+       select SPL_SYS_MALLOC_SIMPLE if SUPPORT_SPL
        select SYS_NS16550
        select USB
        select USB_STORAGE
@@ -564,6 +580,7 @@ config ARCH_ZYNQ
        select SPL_OF_CONTROL if SPL
        select DM
        select DM_ETH
+       select DM_GPIO
        select SPL_DM if SPL
        select DM_MMC
        select DM_SPI
@@ -576,8 +593,6 @@ config ARCH_ZYNQMP
        select ARM64
        select DM
        select OF_CONTROL
-       select DM_ETH
-       select DM_MMC
        select DM_SERIAL
 
 config TEGRA
@@ -686,6 +701,10 @@ config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA
 
+config TARGET_ZIPITZ2
+       bool "Support zipitz2"
+       select CPU_PXA
+
 config TARGET_COLIBRI_PXA270
        bool "Support colibri_pxa270"
        select CPU_PXA
@@ -765,6 +784,8 @@ source "arch/arm/mach-rockchip/Kconfig"
 
 source "arch/arm/mach-s5pc1xx/Kconfig"
 
+source "arch/arm/mach-snapdragon/Kconfig"
+
 source "arch/arm/mach-socfpga/Kconfig"
 
 source "arch/arm/mach-stm32/Kconfig"
@@ -859,6 +880,7 @@ source "board/technologic/ts4800/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
+source "board/zipitz2/Kconfig"
 
 source "arch/arm/Kconfig.debug"