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

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

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 7e85b69679d2b4eb3bdcd005776042300ae5a3fc..a089e9439ec72a2781debc51e794f8f1a851ca68 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -45,15 +45,15 @@ config AT91SAM9X5
 
 config SAMA5D2
        bool
-       select CPU_V7
+       select CPU_V7A
 
 config SAMA5D3
        bool
-       select CPU_V7
+       select CPU_V7A
 
 config SAMA5D4
        bool
-       select CPU_V7
+       select CPU_V7A
 
 choice
        prompt "Atmel AT91 board select"
@@ -76,17 +76,21 @@ config TARGET_SNAPPER9260
        bool "Support snapper9260"
        select AT91SAM9260
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_GURNARD
        bool "Support gurnard"
        select AT91SAM9G45
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
-       select DM_GPIO
        select DM_ETH
+       select DM_GPIO
+       select DM_SERIAL
+       select DM_SPI
+       select SPI
+       imply CMD_DM
 
 config TARGET_AT91SAM9261EK
        bool "Atmel at91sam9261 reference board"
@@ -113,8 +117,8 @@ config TARGET_PM9263
 config TARGET_AT91SAM9M10G45EK
        bool "Atmel AT91SAM9M10G45-EK board"
        select AT91SAM9M10G45
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
+       select SUPPORT_SPL
 
 config TARGET_PM9G45
        bool "Ronetix pm9g45 board"
@@ -128,8 +132,8 @@ config TARGET_PICOSAM9G45
 config TARGET_AT91SAM9N12EK
        bool "Atmel AT91SAM9N12-EK board"
        select AT91SAM9N12
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
+       select SUPPORT_SPL
 
 config TARGET_AT91SAM9RLEK
        bool "Atmel at91sam9rl reference board"
@@ -139,29 +143,36 @@ config TARGET_AT91SAM9RLEK
 config TARGET_AT91SAM9X5EK
        bool "Atmel AT91SAM9X5-EK board"
        select AT91SAM9X5
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select SUPPORT_SPL
 
-config TARGET_SAMA5D2_PTC
-       bool "SAMA5D2 PTC board"
-       select SAMA5D2
+config TARGET_GARDENA_SMART_GATEWAY_AT91SAM
+       bool "GARDENA smart Gateway (AT91SAM)"
+       select AT91SAM9X5
+       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
        select SUPPORT_SPL
+
+config TARGET_SAMA5D2_PTC_EK
+       bool "SAMA5D2 PTC EK board"
        select BOARD_EARLY_INIT_F
+       select SAMA5D2
+       select BOARD_LATE_INIT
 
 config TARGET_SAMA5D2_XPLAINED
        bool "SAMA5D2 Xplained board"
-       select SAMA5D2
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select SAMA5D2
+       select SUPPORT_SPL
 
 config TARGET_SAMA5D27_SOM1_EK
        bool "SAMA5D27 SOM1 EK board"
-       select CPU_V7
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select CPU_V7A
+       select SUPPORT_SPL
        help
          The SAMA5D27 SOM1 embeds SAMA5D2 SiP(System in Package),
          a 64Mbit QSPI flash, KSZ8081 Phy and a Mac-address EEPROM
@@ -171,33 +182,29 @@ config TARGET_SAMA5D27_SOM1_EK
 
 config TARGET_SAMA5D3_XPLAINED
        bool "SAMA5D3 Xplained board"
+       select BOARD_EARLY_INIT_F
        select SAMA5D3
        select SUPPORT_SPL
-       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
 
 config TARGET_SAMA5D3XEK
        bool "SAMA5D3X-EK board"
-       select SAMA5D3
+       select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select SAMA5D3
        select SUPPORT_SPL
-       select BOARD_EARLY_INIT_F
 
 config TARGET_SAMA5D4_XPLAINED
        bool "SAMA5D4 Xplained board"
-       select SAMA5D4
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select SAMA5D4
+       select SUPPORT_SPL
 
 config TARGET_SAMA5D4EK
        bool "SAMA5D4 Evaluation Kit"
-       select SAMA5D4
-       select SUPPORT_SPL
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
-
-config TARGET_MA5D4EVK
-       bool "Aries MA5D4EVK Evaluation Kit"
        select SAMA5D4
        select SUPPORT_SPL
 
@@ -208,33 +215,54 @@ config TARGET_MEESC
 config TARGET_CORVUS
        bool "Support corvus"
        select AT91SAM9M10G45
-       select SUPPORT_SPL
        select DM
-       select DM_SERIAL
-       select DM_GPIO
        select DM_ETH
+       select DM_GPIO
+       select DM_SERIAL
+       select SUPPORT_SPL
+       imply CMD_DM
 
 config TARGET_TAURUS
        bool "Support taurus"
        select AT91SAM9G20
-       select SUPPORT_SPL
        select DM
-       select DM_SERIAL
-       select DM_GPIO
        select DM_ETH
+       select DM_GPIO
+       select DM_SERIAL
+       select DM_SPI
+       select SPI
+       select SUPPORT_SPL
+       imply CMD_DM
 
 config TARGET_SMARTWEB
        bool "Support smartweb"
        select AT91SAM9260
-       select SUPPORT_SPL
        select DM
-       select DM_SERIAL
-       select DM_GPIO
        select DM_ETH
+       select DM_GPIO
+       select DM_SERIAL
+       select SUPPORT_SPL
+       imply CMD_DM
 
 config TARGET_VINCO
        bool "Support VINCO"
+       select DM
+       select DM_SPI
        select SAMA5D4
+       select SPI
+       select SUPPORT_SPL
+       imply CMD_DM
+
+config TARGET_WB45N
+       bool "Support Laird WB45N"
+       select CPU_ARM926EJS
+       select SUPPORT_SPL
+
+config TARGET_WB50N
+       bool "Support Laird WB50N"
+       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
+       select CPU_V7A
        select SUPPORT_SPL
 
 endchoice
@@ -242,7 +270,6 @@ endchoice
 config SYS_SOC
        default "at91"
 
-source "board/aries/ma5d4evk/Kconfig"
 source "board/atmel/at91rm9200ek/Kconfig"
 source "board/atmel/at91sam9260ek/Kconfig"
 source "board/atmel/at91sam9261ek/Kconfig"
@@ -251,7 +278,7 @@ source "board/atmel/at91sam9m10g45ek/Kconfig"
 source "board/atmel/at91sam9n12ek/Kconfig"
 source "board/atmel/at91sam9rlek/Kconfig"
 source "board/atmel/at91sam9x5ek/Kconfig"
-source "board/atmel/sama5d2_ptc/Kconfig"
+source "board/atmel/sama5d2_ptc_ek/Kconfig"
 source "board/atmel/sama5d2_xplained/Kconfig"
 source "board/atmel/sama5d27_som1_ek/Kconfig"
 source "board/atmel/sama5d3_xplained/Kconfig"
@@ -263,6 +290,7 @@ source "board/bluewater/snapper9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
 source "board/egnite/ethernut5/Kconfig"
 source "board/esd/meesc/Kconfig"
+source "board/gardena/smart-gateway-at91sam/Kconfig"
 source "board/l+g/vinco/Kconfig"
 source "board/mini-box/picosam9g45/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
@@ -271,9 +299,11 @@ source "board/ronetix/pm9g45/Kconfig"
 source "board/siemens/corvus/Kconfig"
 source "board/siemens/taurus/Kconfig"
 source "board/siemens/smartweb/Kconfig"
+source "board/laird/wb45n/Kconfig"
+source "board/laird/wb50n/Kconfig"
 
 config SPL_LDSCRIPT
        default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if CPU_ARM926EJS
-       default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7
+       default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7A
 
 endif