Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0d463088a2e4c180e043ba91432bca0064145b4f..21df1c415f58897caa6575c14057612669d6a9d1 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -553,7 +553,7 @@ config ARCH_DAVINCI
        help
          Support for TI's DaVinci platform.
 
        help
          Support for TI's DaVinci platform.
 

-config KIRKWOOD
+config ARCH_KIRKWOOD

        bool "Marvell Kirkwood"
        select ARCH_MISC_INIT
        select BOARD_EARLY_INIT_F
        bool "Marvell Kirkwood"
        select ARCH_MISC_INIT
        select BOARD_EARLY_INIT_F


@@ -576,7 +576,7 @@ config TARGET_APF27
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
        select CPU_ARM926EJS
        select SUPPORT_SPL
 

-config ORION5X
+config ARCH_ORION5X

        bool "Marvell Orion"
        select CPU_ARM926EJS
 
        bool "Marvell Orion"
        select CPU_ARM926EJS
 


@@ -1142,7 +1142,7 @@ config ARCH_ZYNQMP
        imply MP
        imply DM_USB_GADGET
 
        imply MP
        imply DM_USB_GADGET
 

-config TEGRA
+config ARCH_TEGRA

        bool "NVIDIA Tegra"
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
        bool "NVIDIA Tegra"
        imply DISTRO_DEFAULTS
        imply FAT_WRITE


@@ -1582,6 +1582,7 @@ config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        select BOARD_LATE_INIT
        select DM
        bool "Socionext UniPhier SoCs"
        select BOARD_LATE_INIT
        select DM

+       select DM_ETH

        select DM_GPIO
        select DM_I2C
        select DM_MMC
        select DM_GPIO
        select DM_I2C
        select DM_MMC


@@ -1607,7 +1608,7 @@ config ARCH_UNIPHIER
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 

-config STM32
+config ARCH_STM32

        bool "Support STMicroelectronics STM32 MCU with cortex M"
        select CPU_V7M
        select DM
        bool "Support STMicroelectronics STM32 MCU with cortex M"
        select CPU_V7M
        select DM


@@ -1777,7 +1778,7 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
 
 source "arch/arm/mach-kirkwood/Kconfig"
 

-source "arch/arm/cpu/arm926ejs/lpc32xx/Kconfig"
+source "arch/arm/mach-lpc32xx/Kconfig"

 
 source "arch/arm/mach-mvebu/Kconfig"
 
 
 source "arch/arm/mach-mvebu/Kconfig"