* [PATCH 2/8] Convert CONFIG_AT91SAM9260 et al to Kconfig
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-12 4:07 ` [PATCH 3/8] Convert CONFIG_AT91SAM9G20EK " Tom Rini
` (6 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This converts the following to Kconfig:
CONFIG_AT91SAM9260
CONFIG_AT91SAM9G20
CONFIG_AT91SAM9XE
CONFIG_AT91SAM9261
CONFIG_AT91SAM9263
CONFIG_AT91SAM9G45
CONFIG_AT91SAM9M10G45
CONFIG_AT91SAM9N12
CONFIG_AT91SAM9RL
CONFIG_AT91SAM9X5
CONFIG_SAM9X60
CONFIG_SAMA7G5
CONFIG_SAMA5D2
CONFIG_SAMA5D3
CONFIG_SAMA5D4
These options are already select'd as needed, so we're just cleaning up
files here.
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-at91/Kconfig | 1 +
configs/at91sam9260ek_dataflash_cs0_defconfig | 2 +-
configs/at91sam9260ek_dataflash_cs1_defconfig | 2 +-
configs/at91sam9260ek_nandflash_defconfig | 2 +-
configs/at91sam9261ek_dataflash_cs0_defconfig | 2 +-
configs/at91sam9261ek_dataflash_cs3_defconfig | 2 +-
configs/at91sam9261ek_nandflash_defconfig | 2 +-
configs/at91sam9263ek_dataflash_cs0_defconfig | 2 +-
configs/at91sam9263ek_dataflash_defconfig | 2 +-
configs/at91sam9263ek_nandflash_defconfig | 2 +-
configs/at91sam9263ek_norflash_boot_defconfig | 2 +-
configs/at91sam9263ek_norflash_defconfig | 2 +-
configs/at91sam9g20ek_2mmc_defconfig | 2 +-
configs/at91sam9g20ek_2mmc_nandflash_defconfig | 2 +-
configs/at91sam9g20ek_dataflash_cs0_defconfig | 2 +-
configs/at91sam9g20ek_dataflash_cs1_defconfig | 2 +-
configs/at91sam9g20ek_nandflash_defconfig | 2 +-
configs/at91sam9rlek_dataflash_defconfig | 2 +-
configs/at91sam9rlek_mmc_defconfig | 2 +-
configs/at91sam9rlek_nandflash_defconfig | 2 +-
configs/at91sam9xeek_dataflash_cs0_defconfig | 2 +-
configs/at91sam9xeek_dataflash_cs1_defconfig | 2 +-
configs/at91sam9xeek_nandflash_defconfig | 2 +-
configs/axm_defconfig | 1 -
configs/corvus_defconfig | 2 +-
configs/ethernut5_defconfig | 1 -
configs/gurnard_defconfig | 1 -
configs/meesc_dataflash_defconfig | 2 +-
configs/meesc_defconfig | 2 +-
configs/pm9261_defconfig | 1 -
configs/pm9263_defconfig | 1 -
configs/sama5d27_giantboard_defconfig | 1 -
configs/sama5d27_som1_ek_mmc1_defconfig | 1 -
configs/sama5d27_som1_ek_mmc_defconfig | 1 -
configs/sama5d27_som1_ek_qspiflash_defconfig | 1 -
configs/sama5d27_wlsom1_ek_mmc_defconfig | 1 -
configs/sama5d27_wlsom1_ek_qspiflash_defconfig | 1 -
configs/sama5d2_icp_mmc_defconfig | 1 -
configs/sama5d2_icp_qspiflash_defconfig | 1 -
configs/sama5d2_ptc_ek_mmc_defconfig | 1 -
configs/sama5d2_ptc_ek_nandflash_defconfig | 1 -
configs/sama5d2_xplained_emmc_defconfig | 2 +-
configs/sama5d2_xplained_mmc_defconfig | 2 +-
configs/sama5d2_xplained_qspiflash_defconfig | 2 +-
configs/smartweb_defconfig | 1 -
configs/snapper9260_defconfig | 1 -
configs/snapper9g20_defconfig | 1 -
configs/taurus_defconfig | 1 -
configs/usb_a9263_dataflash_defconfig | 2 +-
49 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 00f31045d67f..e99b9064e519 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -176,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
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 0a6295e655f2..568084880192 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index 1ddee34fe45d..a393120b9bef 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS1"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index 0e92e3aa444a..a5b9b5e7f6e5 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 11126d59a7bd..809aa718160f 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index 01c8d0ed4543..aa7770637508 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS3"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 5674944870d9..9b86fc5628e4 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -14,7 +14,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 5508855af8ec..641d91ef7e11 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 5508855af8ec..641d91ef7e11 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index 4df2bfe249d1..a705e45636b8 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index 4eb24a8b16d9..aeb189d2b7df 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_BOOT_NORFLASH"
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index 99c4d676ad9c..a424dd7fa740 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NORFLASH"
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index cbfaef4e4485..6ee645a7738f 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_MMC"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 77d9ab6b8b85..b2ee395433d2 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 2e09c7da5d00..1bfeb5a789ee 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index 5ad7c4cbe249..cc6da7acca57 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS1"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index 763a5f4fbc10..4a2550b49240 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 9943b868c0da..713dbb3621cb 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index 9fd20428afe1..74e96b95f7e3 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootwait"
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index a922780eaee1..d1c888bf3864 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 8b4a146e340d..568084880192 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index 57484dfd239f..a393120b9bef 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS1"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index 6c25da9472b9..a5b9b5e7f6e5 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 518e6d44c08d..e27f0b71ed90 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -28,7 +28,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run flash_self"
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 6ea76dbf4f6b..0d7352cc4e45 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -20,7 +20,7 @@ CONFIG_SPL_SERIAL=y
CONFIG_SPL=y
CONFIG_ENV_OFFSET_REDUND=0x180000
CONFIG_SYS_LOAD_ADDR=0x70000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig
index b7169b19940f..339e8d147ac1 100644
--- a/configs/ethernut5_defconfig
+++ b/configs/ethernut5_defconfig
@@ -14,7 +14,6 @@ CONFIG_ENV_SECT_SIZE=0x21000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="ethernut5"
CONFIG_SYS_LOAD_ADDR=0x020000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index 7def2253a5c1..c44714f4a38f 100644
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0x80000
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard"
CONFIG_SYS_LOAD_ADDR=0x23000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45"
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/meesc_dataflash_defconfig b/configs/meesc_dataflash_defconfig
index 0e8a545ea1eb..5858a99abd21 100644
--- a/configs/meesc_dataflash_defconfig
+++ b/configs/meesc_dataflash_defconfig
@@ -14,7 +14,7 @@ CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
CONFIG_SYS_LOAD_ADDR=0x20100000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/meesc_defconfig b/configs/meesc_defconfig
index 9e5eb5aeef81..9141bdfc749b 100644
--- a/configs/meesc_defconfig
+++ b/configs/meesc_defconfig
@@ -12,7 +12,7 @@ CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
CONFIG_SYS_LOAD_ADDR=0x20100000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y
CONFIG_BOARD_EARLY_INIT_F=y
diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index eb07b420a3d3..7a640ff35ece 100644
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index f0767a4aa68f..3c5f0b73abf6 100644
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
diff --git a/configs/sama5d27_giantboard_defconfig b/configs/sama5d27_giantboard_defconfig
index 9ca984c1c954..7d25474260d3 100644
--- a/configs/sama5d27_giantboard_defconfig
+++ b/configs/sama5d27_giantboard_defconfig
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_AUTOBOOT_KEYED=y
diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig
index c958f2a19b71..1df7ae08976f 100644
--- a/configs/sama5d27_som1_ek_mmc1_defconfig
+++ b/configs/sama5d27_som1_ek_mmc1_defconfig
@@ -25,7 +25,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig
index 279a5f372667..adb6580f192c 100644
--- a/configs/sama5d27_som1_ek_mmc_defconfig
+++ b/configs/sama5d27_som1_ek_mmc_defconfig
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig
index 8753790d9e55..cd5142521a0d 100644
--- a/configs/sama5d27_som1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_som1_ek_qspiflash_defconfig
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_QSPI_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d27_wlsom1_ek_mmc_defconfig b/configs/sama5d27_wlsom1_ek_mmc_defconfig
index ac2e916c567e..43be6fbeb321 100644
--- a/configs/sama5d27_wlsom1_ek_mmc_defconfig
+++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig
@@ -24,7 +24,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index a44ba50fa2ce..574a67e07ee6 100644
--- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@ -24,7 +24,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_QSPI_BOOT=y
CONFIG_SPI_BOOT=y
CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig
index 49fe180205ab..5b530f0da66e 100644
--- a/configs/sama5d2_icp_mmc_defconfig
+++ b/configs/sama5d2_icp_mmc_defconfig
@@ -24,7 +24,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig
index 78b65a94aa67..e103ae3ddec4 100644
--- a/configs/sama5d2_icp_qspiflash_defconfig
+++ b/configs/sama5d2_icp_qspiflash_defconfig
@@ -18,7 +18,6 @@ CONFIG_SYS_BOOT_GET_CMDLINE=y
CONFIG_SYS_BOOT_GET_KBD=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_QSPI_BOOT=y
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig
index 46f9bd33238c..609e202c34de 100644
--- a/configs/sama5d2_ptc_ek_mmc_defconfig
+++ b/configs/sama5d2_ptc_ek_mmc_defconfig
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig
index cbef580be064..132f31a3d474 100644
--- a/configs/sama5d2_ptc_ek_nandflash_defconfig
+++ b/configs/sama5d2_ptc_ek_nandflash_defconfig
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
CONFIG_NAND_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig
index 47672b524a08..caacbabb7bf2 100644
--- a/configs/sama5d2_xplained_emmc_defconfig
+++ b/configs/sama5d2_xplained_emmc_defconfig
@@ -25,7 +25,7 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index 4f22d6b9a7db..de9fe9d13b6c 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC"
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/sama5d2_xplained_qspiflash_defconfig b/configs/sama5d2_xplained_qspiflash_defconfig
index e21b6a8d7d6e..24b509d06276 100644
--- a/configs/sama5d2_xplained_qspiflash_defconfig
+++ b/configs/sama5d2_xplained_qspiflash_defconfig
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC"
CONFIG_QSPI_BOOT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 426b9394e2f9..64a77b0ddaeb 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -22,7 +22,6 @@ CONFIG_SPL=y
CONFIG_ENV_OFFSET_REDUND=0x180000
CONFIG_SYS_LOAD_ADDR=0x22000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
CONFIG_BOOTDELAY=3
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 59ab0756a3ae..c2049153275b 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
CONFIG_SYS_LOAD_ADDR=0x23000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 ip=any"
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 4ed958d1c139..f18ead2f4080 100644
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
CONFIG_SYS_LOAD_ADDR=0x23000000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 ip=any"
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index eaede092f853..c68945d4b7ec 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -30,7 +30,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/usb_a9263_dataflash_defconfig b/configs/usb_a9263_dataflash_defconfig
index 1f34f3369add..e38313b9baf5 100644
--- a/configs/usb_a9263_dataflash_defconfig
+++ b/configs/usb_a9263_dataflash_defconfig
@@ -13,7 +13,7 @@ CONFIG_ENV_SECT_SIZE=0x2000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="usb_a9263"
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock1 mtdparts=mtdparts=atmel_nand:16m(kernel)ro,120m(root1),-(root2) rw rootfstype=jffs2"
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/8] Convert CONFIG_AT91SAM9G20EK et al to Kconfig
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
2022-03-12 4:07 ` [PATCH 2/8] Convert CONFIG_AT91SAM9260 " Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-12 4:07 ` [PATCH 4/8] Convert CONFIG_AT91SAM9G10EK " Tom Rini
` (5 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This converts the following to Kconfig:
CONFIG_AT91SAM9G20EK
CONFIG_AT91SAM9260EK
CONFIG_AT91SAM9G20EK_2MMC
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/atmel/at91sam9260ek/Kconfig | 15 +++++++++++++++
configs/at91sam9260ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9260ek_nandflash_defconfig | 1 +
configs/at91sam9g20ek_2mmc_defconfig | 4 +++-
configs/at91sam9g20ek_2mmc_nandflash_defconfig | 4 +++-
configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9g20ek_nandflash_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs0_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs1_defconfig | 1 +
configs/at91sam9xeek_nandflash_defconfig | 1 +
include/configs/at91sam9260ek.h | 9 ---------
13 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/board/atmel/at91sam9260ek/Kconfig b/board/atmel/at91sam9260ek/Kconfig
index 3844f086b4c1..40db313ba8aa 100644
--- a/board/atmel/at91sam9260ek/Kconfig
+++ b/board/atmel/at91sam9260ek/Kconfig
@@ -9,4 +9,19 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "at91sam9260ek"
+choice
+ prompt "Evaluation board"
+
+config AT91SAM9G20EK
+ bool "Atmel AT91SAM9G20 EK"
+
+config AT91SAM9260EK
+ bool "Atmel AT91SAM9260 EK"
+
+endchoice
+
+config AT91SAM9G20EK_2MMC
+ bool "Atmel AT91SAM9G20 EK 2MMC variant"
+ depends on AT91SAM9260EK
+
endif
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 568084880192..15866a8ebbda 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index a393120b9bef..ade828e48617 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index a5b9b5e7f6e5..caa9699425bb 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index 6ee645a7738f..665dfc8c7890 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -6,6 +6,8 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x23000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
+CONFIG_AT91SAM9G20EK_2MMC=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x2000
@@ -16,7 +18,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_MMC"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index b2ee395433d2..37a420edb71e 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -6,6 +6,8 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
+CONFIG_AT91SAM9G20EK_2MMC=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc"
@@ -15,7 +17,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 1bfeb5a789ee..48de0be95dc2 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index cc6da7acca57..dfc756a0e723 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index 4a2550b49240..ddd64d31ff33 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 568084880192..15866a8ebbda 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index a393120b9bef..ade828e48617 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index a5b9b5e7f6e5..caa9699425bb 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 820c6a921be0..f5eeed8c179f 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -27,15 +27,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* main clock xtal */
-/* Define actual evaluation board type from used processor type */
-#ifdef CONFIG_AT91SAM9G20
-# define CONFIG_AT91SAM9G20EK /* It's an Atmel AT91SAM9G20 EK */
-#else
-# define CONFIG_AT91SAM9260EK /* It's an Atmel AT91SAM9260 EK */
-#endif
-
-/* Misc CPU related */
-
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/8] Convert CONFIG_AT91SAM9G10EK et al to Kconfig
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
2022-03-12 4:07 ` [PATCH 2/8] Convert CONFIG_AT91SAM9260 " Tom Rini
2022-03-12 4:07 ` [PATCH 3/8] Convert CONFIG_AT91SAM9G20EK " Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-12 4:07 ` [PATCH 5/8] atmel: Remove CONFIG_AT91SAM9G45EKES Tom Rini
` (4 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This converts the following to Kconfig:
CONFIG_AT91SAM9G10EK
CONFIG_AT91SAM9261EK
CONFIG_AT91SAM9G10
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/atmel/at91sam9261ek/Kconfig | 14 ++++++++++++++
configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9261ek_nandflash_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs0_defconfig | 3 ++-
configs/at91sam9g10ek_dataflash_cs3_defconfig | 3 ++-
configs/at91sam9g10ek_nandflash_defconfig | 3 ++-
include/configs/at91sam9261ek.h | 6 ------
8 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/board/atmel/at91sam9261ek/Kconfig b/board/atmel/at91sam9261ek/Kconfig
index 2971b3cf9fb4..6133efe23e8a 100644
--- a/board/atmel/at91sam9261ek/Kconfig
+++ b/board/atmel/at91sam9261ek/Kconfig
@@ -9,4 +9,18 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "at91sam9261ek"
+choice
+ prompt "Evaluation board"
+
+config AT91SAM9G10EK
+ bool "Atmel AT91SAM9G10 EK"
+
+config AT91SAM9261EK
+ bool "Atmel AT91SAM9261 EK"
+
+config AT91SAM9G10
+ bool "Atmel AT91SAM9G10 EK"
+
+endchoice
+
endif
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 809aa718160f..1bfd11f92fb8 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_AT91SAM9261EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index aa7770637508..ed6621438abe 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_AT91SAM9261EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 9b86fc5628e4..8e1bbb0441a3 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_AT91SAM9261EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index cee1f9c6f75a..a84736277d83 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_AT91SAM9G10=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
@@ -16,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index f2724cd26ddc..baff817cfaf2 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_AT91SAM9G10=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
@@ -16,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS3"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 647a0e7d1da7..9cdf3a2ee008 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_AT91SAM9G10=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
@@ -14,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_ENV_OFFSET_REDUND=0x100000
CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
-CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH"
+CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH"
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index b6d0247d7cf6..347e255bfb0a 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -14,12 +14,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
-#ifdef CONFIG_AT91SAM9G10
-#define CONFIG_AT91SAM9G10EK /* It's an Atmel AT91SAM9G10 EK*/
-#else
-#define CONFIG_AT91SAM9261EK /* It's an Atmel AT91SAM9261 EK*/
-#endif
-
#include <asm/hardware.h>
#define CONFIG_ATMEL_LEGACY
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/8] atmel: Remove CONFIG_AT91SAM9G45EKES
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
` (2 preceding siblings ...)
2022-03-12 4:07 ` [PATCH 4/8] Convert CONFIG_AT91SAM9G10EK " Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-12 4:07 ` [PATCH 6/8] atmel: Remove CONFIG_AT91SAM9G45_LCD_BASE Tom Rini
` (3 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This symbol is used only once, and in comparison with an unset symbol,
so drop it.
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 4 ----
include/configs/at91sam9m10g45ek.h | 2 --
2 files changed, 6 deletions(-)
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 8cb2808e058a..b1462b3e3ebd 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -267,11 +267,7 @@ int board_early_init_f(void)
int board_init(void)
{
/* arch number of AT91SAM9M10G45EK-Board */
-#ifdef CONFIG_AT91SAM9M10G45EK
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9M10G45EK;
-#elif defined CONFIG_AT91SAM9G45EKES
- gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G45EKES;
-#endif
/* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index a6f0844443d0..2616ca68eb5f 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -16,8 +16,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-#define CONFIG_AT91SAM9M10G45EK
-
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 6/8] atmel: Remove CONFIG_AT91SAM9G45_LCD_BASE
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
` (3 preceding siblings ...)
2022-03-12 4:07 ` [PATCH 5/8] atmel: Remove CONFIG_AT91SAM9G45EKES Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-12 4:07 ` [PATCH 7/8] Convert CONFIG_AT91_GPIO_PULLUP to Kconfig Tom Rini
` (2 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This variable is used once and is noted as board-specific. Use the
value directly with a comment.
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 3 ++-
include/configs/at91sam9m10g45ek.h | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index b1462b3e3ebd..fcca8923e38f 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -214,7 +214,8 @@ static void at91sam9m10g45ek_lcd_hw_init(void)
at91_periph_clk_enable(ATMEL_ID_LCDC);
- gd->fb_base = CONFIG_AT91SAM9G45_LCD_BASE;
+ /* board specific(not enough SRAM) */
+ gd->fb_base = 0x73E00000;
}
#ifdef CONFIG_LCD_INFO
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 2616ca68eb5f..31e075350fd4 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -27,8 +27,6 @@
#define CONFIG_LCD_INFO_BELOW_LOGO
#define CONFIG_ATMEL_LCD
#define CONFIG_ATMEL_LCD_RGB565
-/* board specific(not enough SRAM) */
-#define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE 0x70000000
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 7/8] Convert CONFIG_AT91_GPIO_PULLUP to Kconfig
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
` (4 preceding siblings ...)
2022-03-12 4:07 ` [PATCH 6/8] atmel: Remove CONFIG_AT91SAM9G45_LCD_BASE Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-12 4:07 ` [PATCH 8/8] Convert CONFIG_ATMEL_LEGACY " Tom Rini
2022-03-19 1:28 ` [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al " Tom Rini
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This converts the following to Kconfig:
CONFIG_AT91_GPIO_PULLUP
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-at91/Kconfig | 4 ++++
configs/axm_defconfig | 1 +
configs/corvus_defconfig | 1 +
configs/gurnard_defconfig | 1 +
configs/smartweb_defconfig | 1 +
configs/snapper9260_defconfig | 1 +
configs/snapper9g20_defconfig | 1 +
configs/taurus_defconfig | 1 +
include/configs/corvus.h | 1 -
include/configs/smartweb.h | 1 -
include/configs/snapper9260.h | 1 -
include/configs/snapper9g45.h | 1 -
include/configs/taurus.h | 1 -
13 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e99b9064e519..79fe87ca58e0 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -311,6 +311,10 @@ config AT91_EFLASH
Enable the driver for the embedded flash used in the Atmel
AT91SAM9XE devices.
+config AT91_GPIO_PULLUP
+ bool "Keep pullups on peripheral pins"
+ depends on CPU_ARM926EJS
+
source "board/atmel/at91sam9260ek/Kconfig"
source "board/atmel/at91sam9261ek/Kconfig"
source "board/atmel/at91sam9263ek/Kconfig"
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index e27f0b71ed90..b6b4104d243f 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_TEXT_BASE=0x21000000
CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_TAURUS=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 0d7352cc4e45..57cc21764a64 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_TEXT_BASE=0x72000000
CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x800
CONFIG_TARGET_CORVUS=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index c44714f4a38f..28ed4ae837db 100644
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARCH_AT91=y
CONFIG_SYS_TEXT_BASE=0x73f00000
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_TARGET_GURNARD=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 64a77b0ddaeb..f39d08371644 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_TEXT_BASE=0x23000000
CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_SMARTWEB=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index c2049153275b..69b73c982104 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -5,6 +5,7 @@ CONFIG_ARCH_AT91=y
CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_TARGET_SNAPPER9260=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index f18ead2f4080..13c4ebe803ad 100644
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -5,6 +5,7 @@ CONFIG_ARCH_AT91=y
CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_TARGET_SNAPPER9260=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index c68945d4b7ec..0b25c3dac1de 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_TEXT_BASE=0x21000000
CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_TAURUS=y
+CONFIG_AT91_GPIO_PULLUP=y
CONFIG_BOARD_TAURUS=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 4c25c906e811..c08ef567ed48 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -31,7 +31,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
/* serial console */
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 8fb29b0babac..15b7727be0b0 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -74,7 +74,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
/* serial console */
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 686134409572..bf14bd498939 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -54,7 +54,6 @@
/* GPIOs and IO expander */
#define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO_PULLUP 1
#define CONFIG_PCA953X
#define CONFIG_SYS_I2C_PCA953X_ADDR 0x28
#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x28, 16} }
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index 069f4c2d2494..f79e421c2612 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -50,7 +50,6 @@
/* GPIOs and IO expander */
#define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO_PULLUP 1
/* UARTs/Serial console */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index e4609b5c8971..92e691c1222d 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -36,7 +36,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 8/8] Convert CONFIG_ATMEL_LEGACY to Kconfig
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
` (5 preceding siblings ...)
2022-03-12 4:07 ` [PATCH 7/8] Convert CONFIG_AT91_GPIO_PULLUP to Kconfig Tom Rini
@ 2022-03-12 4:07 ` Tom Rini
2022-03-19 1:28 ` Tom Rini
2022-03-19 1:28 ` [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al " Tom Rini
7 siblings, 1 reply; 16+ messages in thread
From: Tom Rini @ 2022-03-12 4:07 UTC (permalink / raw)
To: u-boot; +Cc: Eugen Hristev
This converts the following to Kconfig:
CONFIG_ATMEL_LEGACY
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-at91/Kconfig | 3 +++
configs/at91sam9260ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9260ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9260ek_nandflash_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9261ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9261ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9263ek_dataflash_defconfig | 1 +
configs/at91sam9263ek_nandflash_defconfig | 1 +
configs/at91sam9263ek_norflash_boot_defconfig | 1 +
configs/at91sam9263ek_norflash_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 +
configs/at91sam9g10ek_nandflash_defconfig | 1 +
configs/at91sam9g20ek_2mmc_defconfig | 1 +
configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 +
configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 +
configs/at91sam9g20ek_nandflash_defconfig | 1 +
configs/at91sam9m10g45ek_mmc_defconfig | 1 +
configs/at91sam9m10g45ek_nandflash_defconfig | 1 +
configs/at91sam9rlek_dataflash_defconfig | 1 +
configs/at91sam9rlek_mmc_defconfig | 1 +
configs/at91sam9rlek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_dataflash_defconfig | 1 +
configs/at91sam9x5ek_mmc_defconfig | 1 +
configs/at91sam9x5ek_nandflash_defconfig | 1 +
configs/at91sam9x5ek_spiflash_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs0_defconfig | 1 +
configs/at91sam9xeek_dataflash_cs1_defconfig | 1 +
configs/at91sam9xeek_nandflash_defconfig | 1 +
configs/axm_defconfig | 1 +
configs/corvus_defconfig | 1 +
configs/gardena-smart-gateway-at91sam_defconfig | 1 +
configs/gurnard_defconfig | 1 +
configs/pm9g45_defconfig | 1 +
configs/sam9x60ek_mmc_defconfig | 1 +
configs/sam9x60ek_nandflash_defconfig | 1 +
configs/sam9x60ek_qspiflash_defconfig | 1 +
configs/smartweb_defconfig | 1 +
configs/snapper9260_defconfig | 1 +
configs/snapper9g20_defconfig | 1 +
configs/taurus_defconfig | 1 +
include/configs/at91sam9260ek.h | 3 ---
include/configs/at91sam9261ek.h | 2 --
include/configs/at91sam9263ek.h | 1 -
include/configs/at91sam9m10g45ek.h | 3 ---
include/configs/at91sam9rlek.h | 2 --
include/configs/at91sam9x5ek.h | 1 -
include/configs/corvus.h | 5 -----
include/configs/gardena-smart-gateway-at91sam.h | 3 ---
include/configs/pm9g45.h | 3 ---
include/configs/sam9x60ek.h | 3 ---
include/configs/smartweb.h | 3 ---
include/configs/snapper9260.h | 1 -
include/configs/snapper9g45.h | 3 ---
include/configs/taurus.h | 3 ---
58 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 79fe87ca58e0..fc193b935e85 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -315,6 +315,9 @@ config AT91_GPIO_PULLUP
bool "Keep pullups on peripheral pins"
depends on CPU_ARM926EJS
+config ATMEL_LEGACY
+ bool "Legacy GPIO support"
+
source "board/atmel/at91sam9260ek/Kconfig"
source "board/atmel/at91sam9261ek/Kconfig"
source "board/atmel/at91sam9263ek/Kconfig"
diff --git a/configs/at91sam9260ek_dataflash_cs0_defconfig b/configs/at91sam9260ek_dataflash_cs0_defconfig
index 15866a8ebbda..05bbbe539662 100644
--- a/configs/at91sam9260ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9260ek_dataflash_cs1_defconfig b/configs/at91sam9260ek_dataflash_cs1_defconfig
index ade828e48617..09956bf75296 100644
--- a/configs/at91sam9260ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9260ek_dataflash_cs1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9260ek_nandflash_defconfig b/configs/at91sam9260ek_nandflash_defconfig
index caa9699425bb..d87cb22138e7 100644
--- a/configs/at91sam9260ek_nandflash_defconfig
+++ b/configs/at91sam9260ek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index 1bfd11f92fb8..0f31c1180650 100644
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9261EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9261ek_dataflash_cs3_defconfig b/configs/at91sam9261ek_dataflash_cs3_defconfig
index ed6621438abe..c51f5c2db1bc 100644
--- a/configs/at91sam9261ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs3_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9261EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9261ek_nandflash_defconfig b/configs/at91sam9261ek_nandflash_defconfig
index 8e1bbb0441a3..f8690f93c520 100644
--- a/configs/at91sam9261ek_nandflash_defconfig
+++ b/configs/at91sam9261ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9261EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig
index 641d91ef7e11..080a38b053b9 100644
--- a/configs/at91sam9263ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9263ek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig
index 641d91ef7e11..080a38b053b9 100644
--- a/configs/at91sam9263ek_dataflash_defconfig
+++ b/configs/at91sam9263ek_dataflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig
index a705e45636b8..27c17146cec1 100644
--- a/configs/at91sam9263ek_nandflash_defconfig
+++ b/configs/at91sam9263ek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig
index aeb189d2b7df..9644ada94f25 100644
--- a/configs/at91sam9263ek_norflash_boot_defconfig
+++ b/configs/at91sam9263ek_norflash_boot_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x0000000
CONFIG_SYS_MALLOC_LEN=0x50000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_SECT_SIZE=0x10000
diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig
index a424dd7fa740..a66318dda463 100644
--- a/configs/at91sam9263ek_norflash_defconfig
+++ b/configs/at91sam9263ek_norflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x50000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9263EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_SECT_SIZE=0x10000
diff --git a/configs/at91sam9g10ek_dataflash_cs0_defconfig b/configs/at91sam9g10ek_dataflash_cs0_defconfig
index a84736277d83..a1e07304f970 100644
--- a/configs/at91sam9g10ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs0_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9G10=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9g10ek_dataflash_cs3_defconfig b/configs/at91sam9g10ek_dataflash_cs3_defconfig
index baff817cfaf2..008faccf02a5 100644
--- a/configs/at91sam9g10ek_dataflash_cs3_defconfig
+++ b/configs/at91sam9g10ek_dataflash_cs3_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9G10=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9g10ek_nandflash_defconfig b/configs/at91sam9g10ek_nandflash_defconfig
index 9cdf3a2ee008..14d7861a4923 100644
--- a/configs/at91sam9g10ek_nandflash_defconfig
+++ b/configs/at91sam9g10ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9261EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9G10=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9g20ek_2mmc_defconfig b/configs/at91sam9g20ek_2mmc_defconfig
index 665dfc8c7890..bb1908e580f2 100644
--- a/configs/at91sam9g20ek_2mmc_defconfig
+++ b/configs/at91sam9g20ek_2mmc_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x23000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_AT91SAM9G20EK_2MMC=y
CONFIG_NR_DRAM_BANKS=1
diff --git a/configs/at91sam9g20ek_2mmc_nandflash_defconfig b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
index 37a420edb71e..95da2ca6ab34 100644
--- a/configs/at91sam9g20ek_2mmc_nandflash_defconfig
+++ b/configs/at91sam9g20ek_2mmc_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_AT91SAM9G20EK_2MMC=y
CONFIG_NR_DRAM_BANKS=1
diff --git a/configs/at91sam9g20ek_dataflash_cs0_defconfig b/configs/at91sam9g20ek_dataflash_cs0_defconfig
index 48de0be95dc2..d8531a8af753 100644
--- a/configs/at91sam9g20ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9g20ek_dataflash_cs1_defconfig b/configs/at91sam9g20ek_dataflash_cs1_defconfig
index dfc756a0e723..27bdb1eb9e98 100644
--- a/configs/at91sam9g20ek_dataflash_cs1_defconfig
+++ b/configs/at91sam9g20ek_dataflash_cs1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9g20ek_nandflash_defconfig b/configs/at91sam9g20ek_nandflash_defconfig
index ddd64d31ff33..c273357e600d 100644
--- a/configs/at91sam9g20ek_nandflash_defconfig
+++ b/configs/at91sam9g20ek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index ea7b07dec89d..b57ff0e74636 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000
CONFIG_SYS_MALLOC_LEN=0x2c000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9M10G45EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4000
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index c242c5cc7485..99540f84f54f 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9M10G45EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig
index 713dbb3621cb..861724f82ce1 100644
--- a/configs/at91sam9rlek_dataflash_defconfig
+++ b/configs/at91sam9rlek_dataflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9RLEK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig
index 74e96b95f7e3..6b6ee626b34b 100644
--- a/configs/at91sam9rlek_mmc_defconfig
+++ b/configs/at91sam9rlek_mmc_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x2c000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9RLEK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4000
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig
index d1c888bf3864..f77dafe61a76 100644
--- a/configs/at91sam9rlek_nandflash_defconfig
+++ b/configs/at91sam9rlek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9RLEK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
diff --git a/configs/at91sam9x5ek_dataflash_defconfig b/configs/at91sam9x5ek_dataflash_defconfig
index 923ed9a56d4a..f3c763756770 100644
--- a/configs/at91sam9x5ek_dataflash_defconfig
+++ b/configs/at91sam9x5ek_dataflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9X5EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
CONFIG_ENV_OFFSET=0x4200
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index b23c4b61ed62..5922f6c0f510 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9X5EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4000
CONFIG_DM_GPIO=y
diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig
index edb16c90d0cb..91a654d25891 100644
--- a/configs/at91sam9x5ek_nandflash_defconfig
+++ b/configs/at91sam9x5ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9X5EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
diff --git a/configs/at91sam9x5ek_spiflash_defconfig b/configs/at91sam9x5ek_spiflash_defconfig
index 781a85421e94..59b010d0d858 100644
--- a/configs/at91sam9x5ek_spiflash_defconfig
+++ b/configs/at91sam9x5ek_spiflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9X5EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x3000
CONFIG_ENV_OFFSET=0x5000
diff --git a/configs/at91sam9xeek_dataflash_cs0_defconfig b/configs/at91sam9xeek_dataflash_cs0_defconfig
index 15866a8ebbda..05bbbe539662 100644
--- a/configs/at91sam9xeek_dataflash_cs0_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs0_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9xeek_dataflash_cs1_defconfig b/configs/at91sam9xeek_dataflash_cs1_defconfig
index ade828e48617..09956bf75296 100644
--- a/configs/at91sam9xeek_dataflash_cs1_defconfig
+++ b/configs/at91sam9xeek_dataflash_cs1_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x2d000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x4200
diff --git a/configs/at91sam9xeek_nandflash_defconfig b/configs/at91sam9xeek_nandflash_defconfig
index caa9699425bb..d87cb22138e7 100644
--- a/configs/at91sam9xeek_nandflash_defconfig
+++ b/configs/at91sam9xeek_nandflash_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_AT91SAM9260EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_AT91SAM9260EK=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index b6b4104d243f..3373e6291eaf 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_TAURUS=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 57cc21764a64..c7a59c75cc19 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x800
CONFIG_TARGET_CORVUS=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/gardena-smart-gateway-at91sam_defconfig b/configs/gardena-smart-gateway-at91sam_defconfig
index 97ed6709b3f0..450ff86a370b 100644
--- a/configs/gardena-smart-gateway-at91sam_defconfig
+++ b/configs/gardena-smart-gateway-at91sam_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x22900000
CONFIG_SYS_MALLOC_LEN=0x1000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_GARDENA_SMART_GATEWAY_AT91SAM=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index 28ed4ae837db..5414f1095668 100644
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_TARGET_GURNARD=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/pm9g45_defconfig b/configs/pm9g45_defconfig
index 96bd30cfa202..fc5ae69c19ae 100644
--- a/configs/pm9g45_defconfig
+++ b/configs/pm9g45_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000
CONFIG_SYS_MALLOC_LEN=0x80000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_PM9G45=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig
index 25181d7f0009..238397f0ac9d 100644
--- a/configs/sam9x60ek_mmc_defconfig
+++ b/configs/sam9x60ek_mmc_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x23f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_TARGET_SAM9X60EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=8
CONFIG_ENV_SIZE=0x4000
CONFIG_DM_GPIO=y
diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig
index a786f5a1ea0a..0d3e9d03880d 100644
--- a/configs/sam9x60ek_nandflash_defconfig
+++ b/configs/sam9x60ek_nandflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x23f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_TARGET_SAM9X60EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=8
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig
index bc30c4ced8f1..b0f74e61c35b 100644
--- a/configs/sam9x60ek_qspiflash_defconfig
+++ b/configs/sam9x60ek_qspiflash_defconfig
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x23f00000
CONFIG_SYS_MALLOC_LEN=0x81000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_TARGET_SAM9X60EK=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=8
CONFIG_ENV_SECT_SIZE=0x1000
CONFIG_DM_GPIO=y
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index f39d08371644..ecd689f6bf46 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_SMARTWEB=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 69b73c982104..51bf0448b3a4 100644
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_TARGET_SNAPPER9260=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 13c4ebe803ad..38c10c8ea954 100644
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000
CONFIG_SYS_MALLOC_LEN=0x100000
CONFIG_TARGET_SNAPPER9260=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x80000
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 0b25c3dac1de..e7b661776799 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_TAURUS=y
CONFIG_AT91_GPIO_PULLUP=y
+CONFIG_ATMEL_LEGACY=y
CONFIG_BOARD_TAURUS=y
CONFIG_SPL_GPIO=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index f5eeed8c179f..4252a8ce3795 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -27,9 +27,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* main clock xtal */
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/*
* SDRAM: 1 bank, min 32, max 128 MB
* Initialized before u-boot gets started.
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 347e255bfb0a..fefdb8370927 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -16,8 +16,6 @@
#include <asm/hardware.h>
-#define CONFIG_ATMEL_LEGACY
-
/*
* Hardware drivers
*/
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f523d4761bc8..b084f96afd86 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -30,7 +30,6 @@
/*
* Hardware drivers
*/
-#define CONFIG_ATMEL_LEGACY
/* LCD */
#define LCD_BPP LCD_COLOR8
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 31e075350fd4..0f5d991022c9 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -10,14 +10,11 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/* ARM asynchronous clock */
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
/* LCD */
#define LCD_BPP LCD_COLOR8
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 5bc47d6442f9..89cfcbd9517f 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -16,8 +16,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* main clock xtal */
-#define CONFIG_ATMEL_LEGACY
-
/*
* Hardware drivers
*/
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 47c55ba4a0f1..c813136dbec6 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -13,7 +13,6 @@
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
/*
* define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index c08ef567ed48..caadf6462614 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -23,15 +23,10 @@
* hex number here!
*/
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/* ARM asynchronous clock */
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/* serial console */
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS
diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h
index 9d96dfcc31e4..5e6a8ee770e0 100644
--- a/include/configs/gardena-smart-gateway-at91sam.h
+++ b/include/configs/gardena-smart-gateway-at91sam.h
@@ -17,9 +17,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE 0x20000000
#define CONFIG_SYS_SDRAM_SIZE 0x08000000 /* 128 megs */
diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 48b6e1c077f3..61a7c6255fed 100644
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -19,9 +19,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/* SDRAM */
#define CONFIG_SYS_SDRAM_BASE 0x70000000
#define CONFIG_SYS_SDRAM_SIZE 0x08000000
diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h
index 7716ac27fb90..772805d6242f 100644
--- a/include/configs/sam9x60ek.h
+++ b/include/configs/sam9x60ek.h
@@ -17,9 +17,6 @@
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID 0 /* ignored in arm */
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/*
* define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
* NB: in this case, USB 1.1 devices won't be recognized.
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 15b7727be0b0..259c05df5534 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -72,9 +72,6 @@
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
/* serial console */
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index bf14bd498939..028c6234a073 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -53,7 +53,6 @@
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
/* GPIOs and IO expander */
-#define CONFIG_ATMEL_LEGACY
#define CONFIG_PCA953X
#define CONFIG_SYS_I2C_PCA953X_ADDR 0x28
#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x28, 16} }
diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index f79e421c2612..55e51b4b469d 100644
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -48,9 +48,6 @@
#define CONFIG_ATMEL_LCD
#define CONFIG_GURNARD_SPLASH
-/* GPIOs and IO expander */
-#define CONFIG_ATMEL_LEGACY
-
/* UARTs/Serial console */
/* Boot options */
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 92e691c1222d..4ea3607116e1 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -34,9 +34,6 @@
/* Misc CPU related */
-/* general purpose I/O */
-#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-
#define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS
--
2.25.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig
2022-03-12 4:07 [PATCH 1/8] Convert CONFIG_AM335X_USB0 et al to Kconfig Tom Rini
` (6 preceding siblings ...)
2022-03-12 4:07 ` [PATCH 8/8] Convert CONFIG_ATMEL_LEGACY " Tom Rini
@ 2022-03-19 1:28 ` Tom Rini
7 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2022-03-19 1:28 UTC (permalink / raw)
To: u-boot
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
On Fri, Mar 11, 2022 at 11:07:29PM -0500, Tom Rini wrote:
> This converts the following to Kconfig:
> CONFIG_AM335X_USB0
> CONFIG_AM335X_USB0_MODE
> CONFIG_AM335X_USB1
> CONFIG_AM335X_USB1_MODE
>
> We do this by introducing specific options for static configuration of
> USB0/USB1 in SPL rather than defining CONFIG_AM335X_USBx_MODE to the
> enum value being used. Furthermore, with how the code is used now we do
> not need to have OTG mode exposed as an option here, so remove that.
>
> Signed-off-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/next, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread