Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c871eaf4e39a5eef5f3436a61c6d8e82e324427f..38ad59058f56d7f9a758d554350a60803ef8f576 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -459,6 +459,7 @@ config TARGET_AM335X_SL50
        select CPU_V7
        select SUPPORT_SPL
        select DM
        select CPU_V7
        select SUPPORT_SPL
        select DM

+       select DM_GPIO

        select DM_SERIAL
 
 config TARGET_BAV335X
        select DM_SERIAL
 
 config TARGET_BAV335X


@@ -787,6 +788,7 @@ config TARGET_HIKEY
 
 config TARGET_LS1012AQDS
        bool "Support ls1012aqds"
 
 config TARGET_LS1012AQDS
        bool "Support ls1012aqds"

+       select ARCH_LS1012A

        select ARM64
        help
          Support for Freescale LS1012AQDS platform.
        select ARM64
        help
          Support for Freescale LS1012AQDS platform.


@@ -796,6 +798,7 @@ config TARGET_LS1012AQDS
 
 config TARGET_LS1012ARDB
        bool "Support ls1012ardb"
 
 config TARGET_LS1012ARDB
        bool "Support ls1012ardb"

+       select ARCH_LS1012A

        select ARM64
        help
          Support for Freescale LS1012ARDB platform.
        select ARM64
        help
          Support for Freescale LS1012ARDB platform.


@@ -805,6 +808,7 @@ config TARGET_LS1012ARDB
 
 config TARGET_LS1012AFRDM
        bool "Support ls1012afrdm"
 
 config TARGET_LS1012AFRDM
        bool "Support ls1012afrdm"

+       select ARCH_LS1012A

        select ARM64
        help
          Support for Freescale LS1012AFRDM platform.
        select ARM64
        help
          Support for Freescale LS1012AFRDM platform.


@@ -816,13 +820,21 @@ config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
        select SUPPORT_SPL
        bool "Support ls1021aqds"
        select CPU_V7
        select SUPPORT_SPL

+       select ARCH_LS1021A
+       select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP
+

 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
        select CPU_V7
        select SUPPORT_SPL
 config TARGET_LS1021ATWR
        bool "Support ls1021atwr"
        select CPU_V7
        select SUPPORT_SPL

+       select ARCH_LS1021A
+       select ARCH_SUPPORT_PSCI
+       select LS1_DEEP_SLEEP

 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"
 
 config TARGET_LS1043AQDS
        bool "Support ls1043aqds"

+       select ARCH_LS1043A

        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL


@@ -831,12 +843,39 @@ config TARGET_LS1043AQDS
 
 config TARGET_LS1043ARDB
        bool "Support ls1043ardb"
 
 config TARGET_LS1043ARDB
        bool "Support ls1043ardb"

+       select ARCH_LS1043A

        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
        help
          Support for Freescale LS1043ARDB platform.
 
        select ARM64
        select ARMV8_MULTIENTRY
        select SUPPORT_SPL
        help
          Support for Freescale LS1043ARDB platform.
 

+config TARGET_LS1046AQDS
+       bool "Support ls1046aqds"
+       select ARCH_LS1046A
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       select DM_SPI_FLASH if DM_SPI
+       help
+         Support for Freescale LS1046AQDS platform.
+         The LS1046A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS1046A
+         Layerscape Architecture processor.
+
+config TARGET_LS1046ARDB
+       bool "Support ls1046ardb"
+       select ARCH_LS1046A
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       select DM_SPI_FLASH if DM_SPI
+       help
+         Support for Freescale LS1046ARDB platform.
+         The LS1046A Reference Design Board (RDB) is a high-performance
+         development platform that supports the QorIQ LS1046A
+         Layerscape Architecture processor.
+

 config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA
 config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA


@@ -851,18 +890,24 @@ config TARGET_COLIBRI_PXA270
 
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
 
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"

+       select BLK

        select CLK_UNIPHIER
        select CLK_UNIPHIER

-       select SUPPORT_SPL
-       select SPL
-       select OF_CONTROL
-       select SPL_OF_CONTROL
-       select OF_LIBFDT

        select DM
        select DM

-       select SPL_DM

        select DM_GPIO
        select DM_GPIO

-       select DM_SERIAL

        select DM_I2C
        select DM_MMC
        select DM_I2C
        select DM_MMC

+       select DM_SERIAL
+       select DM_USB
+       select OF_CONTROL
+       select OF_LIBFDT
+       select PINCTRL
+       select SPL
+       select SPL_DM
+       select SPL_LIBCOMMON_SUPPORT
+       select SPL_LIBGENERIC_SUPPORT
+       select SPL_OF_CONTROL
+       select SPL_PINCTRL
+       select SUPPORT_SPL

        help
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
        help
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)


@@ -888,6 +933,7 @@ config ARCH_ROCKCHIP
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH

+       select DM_USB if USB

 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"
 
 config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"


@@ -915,6 +961,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/mach-mvebu/Kconfig"
 
 
 source "arch/arm/mach-mvebu/Kconfig"
 

+source "arch/arm/cpu/armv7/ls102xa/Kconfig"
+

 source "arch/arm/cpu/armv7/mx7/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"
 source "arch/arm/cpu/armv7/mx7/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"


@@ -923,6 +971,8 @@ source "arch/arm/cpu/armv7/mx5/Kconfig"
 
 source "arch/arm/cpu/armv7/omap-common/Kconfig"
 
 
 source "arch/arm/cpu/armv7/omap-common/Kconfig"
 

+source "arch/arm/cpu/armv8/fsl-layerscape/Kconfig"
+

 source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/mach-rmobile/Kconfig"
 source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/mach-rmobile/Kconfig"


@@ -980,7 +1030,9 @@ source "board/freescale/ls2080ardb/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1043aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"
 source "board/freescale/ls1021aqds/Kconfig"
 source "board/freescale/ls1043aqds/Kconfig"
 source "board/freescale/ls1021atwr/Kconfig"

+source "board/freescale/ls1046aqds/Kconfig"

 source "board/freescale/ls1043ardb/Kconfig"
 source "board/freescale/ls1043ardb/Kconfig"

+source "board/freescale/ls1046ardb/Kconfig"

 source "board/freescale/ls1012aqds/Kconfig"
 source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"
 source "board/freescale/ls1012aqds/Kconfig"
 source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"