Merge tag 'v2023.10-rc4' into next

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

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index c78a308f4884eb7f48c057ea616f899a73b06410..4c65fc0dbd25cdcfa4b9bc932be283dad2e8bffa 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -50,6 +50,7 @@ config SAM9X60
 config SAMA7G5
        bool
        select CPU_V7A
+       select AT91RESET_EXTRST
 
 config SAMA5D2
        bool
@@ -69,10 +70,6 @@ choice
        prompt "Atmel AT91 board select"
        optional
 
-config TARGET_AT91RM9200EK
-       bool "Atmel AT91RM9200 evaluation kit"
-       select CPU_ARM920T
-
 config TARGET_AT91SAM9260EK
        bool "Atmel at91sam9260 reference board"
        select AT91SAM9260
@@ -82,20 +79,12 @@ config TARGET_ETHERNUT5
        bool "Ethernut5 board"
        select AT91SAM9XE
 
-config TARGET_SNAPPER9260
-       bool "Support snapper9260"
-       select AT91SAM9260
-       select DM
-       select DM_GPIO
-       select DM_SERIAL
-       imply CMD_DM
-
 config TARGET_GURNARD
        bool "Support gurnard"
        select AT91SAM9G45
+       select AT91_WANTS_COMMON_PHY
        select BOARD_LATE_INIT
        select DM
-       select DM_ETH
        select DM_GPIO
        select DM_SERIAL
        select DM_SPI
@@ -119,6 +108,7 @@ config TARGET_AT91SAM9263EK
 config TARGET_USB_A9263
        bool "Caloa USB A9260 board"
        select AT91SAM9263
+       select AT91_WANTS_COMMON_PHY
 
 config TARGET_PM9263
        bool "Ronetix pm9263 board"
@@ -134,11 +124,6 @@ config TARGET_PM9G45
        bool "Ronetix pm9g45 board"
        select AT91SAM9G45
 
-config TARGET_PICOSAM9G45
-       bool "Mini-box picosam9g45 board"
-       select AT91SAM9M10G45
-       select SUPPORT_SPL
-
 config TARGET_AT91SAM9N12EK
        bool "Atmel AT91SAM9N12-EK board"
        select AT91SAM9N12
@@ -170,6 +155,12 @@ config TARGET_SAM9X60EK
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
 
+config TARGET_SAM9X60_CURIOSITY
+        bool "SAM9X60 CURIOSITY board"
+        select SAM9X60
+        select BOARD_EARLY_INIT_F
+        select BOARD_LATE_INIT
+
 config TARGET_SAMA5D2_PTC_EK
        bool "SAMA5D2 PTC EK board"
        select BOARD_EARLY_INIT_F
@@ -185,6 +176,7 @@ config TARGET_SAMA5D2_XPLAINED
 
 config TARGET_SAMA5D27_SOM1_EK
        bool "SAMA5D27 SOM1 EK board"
+       select SAMA5D2
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
        select CPU_V7A
@@ -223,6 +215,17 @@ config TARGET_SAMA5D2_ICP
          a 64Mbit QSPI flash, 3xMikrobus connectors, 4xUSB ,
          EtherCat and WILC3000 devices on board.
 
+config TARGET_SAMA5D29_CURIOSITY
+       bool "SAMA5D29 CURIOSITY board"
+       select SAMA5D2
+       select BOARD_EARLY_INIT_F
+       select BOARD_LATE_INIT
+       select CPU_V7A
+       help
+         The SAMA5D29 Curiosity embeds SAMA5D29 SoC with 4 Gbit LPDDR2-SDRAM,
+         a 64Mbit QSPI flash with Mac-address, MCP16502 PMIC, RGB LCD connector,
+         2 x Mikrobus connectors, 2 x SD-Card connectors, 2 x USB
+
 config TARGET_SAMA5D3_XPLAINED
        bool "SAMA5D3 Xplained board"
        select BOARD_EARLY_INIT_F
@@ -258,8 +261,8 @@ config TARGET_MEESC
 config TARGET_CORVUS
        bool "Support corvus"
        select AT91SAM9M10G45
+       select AT91_WANTS_COMMON_PHY
        select DM
-       select DM_ETH
        select DM_GPIO
        select DM_SERIAL
        select SUPPORT_SPL
@@ -275,8 +278,8 @@ config TARGET_SAMA7G5EK
 config TARGET_TAURUS
        bool "Support taurus"
        select AT91SAM9G20
+       select AT91_WANTS_COMMON_PHY
        select DM
-       select DM_ETH
        select DM_GPIO
        select DM_SERIAL
        select DM_SPI
@@ -287,8 +290,8 @@ config TARGET_TAURUS
 config TARGET_SMARTWEB
        bool "Support smartweb"
        select AT91SAM9260
+       select AT91_WANTS_COMMON_PHY
        select DM
-       select DM_ETH
        select DM_GPIO
        select DM_SERIAL
        select SUPPORT_SPL
@@ -303,29 +306,42 @@ config TARGET_VINCO
        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
-       select ATMEL_SFR
-
 endchoice
 
 config ATMEL_SFR
        bool
-       default n
+
+config AT91RESET_EXTRST
+       bool
 
 config SYS_SOC
        default "at91"
 
-source "board/atmel/at91rm9200ek/Kconfig"
+config AT91_EFLASH
+       bool "Support AT91 flash driver"
+       depends on AT91SAM9XE
+       select USE_SYS_MAX_FLASH_BANKS
+       help
+         Enable the driver for the embedded flash used in the Atmel
+         AT91SAM9XE devices.
+
+config EFLASH_PROTSECTORS
+       int "Number of flash sectors to protect from erasing"
+       depends on AT91_EFLASH
+       help
+         If non-zero, this will be the number of sectors of the flash to disallow
+         U-Boot to ease, starting from the beginning of flash.
+
+config AT91_GPIO_PULLUP
+       bool "Keep pullups on peripheral pins"
+       depends on CPU_ARM926EJS
+
+config ATMEL_LEGACY
+       bool "Legacy GPIO support"
+
+config AT91_WANTS_COMMON_PHY
+       bool
+
 source "board/atmel/at91sam9260ek/Kconfig"
 source "board/atmel/at91sam9261ek/Kconfig"
 source "board/atmel/at91sam9263ek/Kconfig"
@@ -334,35 +350,29 @@ source "board/atmel/at91sam9n12ek/Kconfig"
 source "board/atmel/at91sam9rlek/Kconfig"
 source "board/atmel/at91sam9x5ek/Kconfig"
 source "board/atmel/sam9x60ek/Kconfig"
+source "board/atmel/sam9x60_curiosity/Kconfig"
 source "board/atmel/sama7g5ek/Kconfig"
 source "board/atmel/sama5d2_ptc_ek/Kconfig"
 source "board/atmel/sama5d2_xplained/Kconfig"
 source "board/atmel/sama5d27_som1_ek/Kconfig"
 source "board/atmel/sama5d27_wlsom1_ek/Kconfig"
 source "board/atmel/sama5d2_icp/Kconfig"
+source "board/atmel/sama5d29_curiosity/Kconfig"
 source "board/atmel/sama5d3_xplained/Kconfig"
 source "board/atmel/sama5d3xek/Kconfig"
 source "board/atmel/sama5d4_xplained/Kconfig"
 source "board/atmel/sama5d4ek/Kconfig"
 source "board/bluewater/gurnard/Kconfig"
-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"
 source "board/ronetix/pm9263/Kconfig"
 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_V7A
 
 endif