From 5d834bfa5fa61dc9dff94a92672c0a1185cb3a83 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Thu, 5 May 2022 14:47:31 -0400
Subject: [PATCH] configs: Resync with savedefconfig
Rsync all defconfig files using moveconfig.py
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/bcm_ns3_defconfig | 1 -
configs/jethub_j100_defconfig | 7 ++-----
configs/odroid-xu3_defconfig | 2 +-
configs/odroid_defconfig | 2 +-
configs/openpiton_riscv64_defconfig | 1 -
configs/origen_defconfig | 2 +-
configs/poleg_evb_defconfig | 1 -
configs/s5pc210_universal_defconfig | 2 +-
configs/sam9x60_curiosity_mmc_defconfig | 4 +---
configs/sam9x60ek_mmc_defconfig | 3 +--
configs/sam9x60ek_nandflash_defconfig | 5 ++---
configs/sam9x60ek_qspiflash_defconfig | 5 ++---
configs/sama5d27_giantboard_defconfig | 7 +++----
configs/sama5d27_som1_ek_mmc1_defconfig | 3 +--
configs/sama5d27_som1_ek_mmc_defconfig | 3 +--
configs/sama5d27_som1_ek_qspiflash_defconfig | 3 +--
configs/sama5d27_wlsom1_ek_mmc_defconfig | 3 +--
configs/sama5d27_wlsom1_ek_qspiflash_defconfig | 3 +--
configs/sama5d2_icp_mmc_defconfig | 3 +--
configs/sama5d2_icp_qspiflash_defconfig | 4 +---
configs/sama5d2_ptc_ek_mmc_defconfig | 3 +--
configs/sama5d2_ptc_ek_nandflash_defconfig | 3 +--
configs/sama5d2_xplained_emmc_defconfig | 3 +--
configs/sama5d2_xplained_mmc_defconfig | 3 +--
configs/sama5d2_xplained_qspiflash_defconfig | 3 +--
configs/sama5d2_xplained_spiflash_defconfig | 3 +--
configs/sama5d36ek_cmp_mmc_defconfig | 3 +--
configs/sama5d36ek_cmp_nandflash_defconfig | 3 +--
configs/sama5d36ek_cmp_spiflash_defconfig | 3 +--
configs/sama5d3_xplained_mmc_defconfig | 3 +--
configs/sama5d3_xplained_nandflash_defconfig | 3 +--
configs/sama5d3xek_mmc_defconfig | 3 +--
configs/sama5d3xek_nandflash_defconfig | 3 +--
configs/sama5d3xek_spiflash_defconfig | 3 +--
configs/sama5d4_xplained_mmc_defconfig | 3 +--
configs/sama5d4_xplained_nandflash_defconfig | 3 +--
configs/sama5d4_xplained_spiflash_defconfig | 3 +--
configs/sama5d4ek_mmc_defconfig | 3 +--
configs/sama5d4ek_nandflash_defconfig | 3 +--
configs/sama5d4ek_spiflash_defconfig | 3 +--
configs/sama7g5ek_mmc1_defconfig | 3 +--
configs/sama7g5ek_mmc_defconfig | 3 +--
configs/stih410-b2260_defconfig | 1 -
configs/theadorable_debug_defconfig | 2 +-
configs/trats2_defconfig | 2 +-
configs/trats_defconfig | 2 +-
configs/vinco_defconfig | 5 ++---
47 files changed, 49 insertions(+), 93 deletions(-)
diff --git a/configs/bcm_ns3_defconfig b/configs/bcm_ns3_defconfig
index 2e0bab6dbd..9267bf3618 100644
--- a/configs/bcm_ns3_defconfig
+++ b/configs/bcm_ns3_defconfig
@@ -52,4 +52,3 @@ CONFIG_OPTEE=y
# CONFIG_OPTEE_TA_AVB is not set
CONFIG_WDT=y
CONFIG_WDT_SP805=y
-CONFIG_SPL_OF_LIBFDT=y
diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig
index a30940bf1c..63c5329398 100644
--- a/configs/jethub_j100_defconfig
+++ b/configs/jethub_j100_defconfig
@@ -17,10 +17,10 @@ CONFIG_REMAKE_ELF=y
CONFIG_OF_BOARD_SETUP=y
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_MISC_INIT_R=y
-CONFIG_CMD_ADC=y
# CONFIG_CMD_BDI is not set
# CONFIG_CMD_IMI is not set
CONFIG_CMD_EEPROM=y
+CONFIG_CMD_ADC=y
CONFIG_CMD_GPIO=y
CONFIG_RANDOM_UUID=y
CONFIG_CMD_I2C=y
@@ -33,12 +33,9 @@ CONFIG_CMD_REGULATOR=y
CONFIG_PARTITION_TYPE_GUID=y
CONFIG_OF_CONTROL=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SARADC_MESON=y
CONFIG_DM_I2C=y
CONFIG_SYS_I2C_MESON=y
-CONFIG_ADC=y
-CONFIG_SARADC_MESON=y
-CONFIG_CLK=y
-CONFIG_CLK_MESON_AXG=y
CONFIG_MMC_MESON_GX=y
CONFIG_MTD_UBI=y
CONFIG_PHY_REALTEK=y
diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig
index 6570b126a2..a4c9c79b81 100644
--- a/configs/odroid-xu3_defconfig
+++ b/configs/odroid-xu3_defconfig
@@ -11,10 +11,10 @@ CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0x310000
CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1/HC2"
+CONFIG_SYS_MEM_TOP_HIDE=0x01600000
CONFIG_SYS_LOAD_ADDR=0x43e00000
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_MEM_TOP_HIDE=0x01600000
CONFIG_FIT=y
CONFIG_FIT_BEST_MATCH=y
CONFIG_SILENT_CONSOLE=y
diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index 4d486d4685..f2a8cd4191 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -12,10 +12,10 @@ CONFIG_NR_DRAM_BANKS=8
CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0x140000
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
+CONFIG_SYS_MEM_TOP_HIDE=0x00100000
CONFIG_SYS_LOAD_ADDR=0x43e00000
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_MEM_TOP_HIDE=0x00100000
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_USE_BOOTARGS=y
diff --git a/configs/openpiton_riscv64_defconfig b/configs/openpiton_riscv64_defconfig
index 78f31a2155..1700f4a2a5 100644
--- a/configs/openpiton_riscv64_defconfig
+++ b/configs/openpiton_riscv64_defconfig
@@ -76,5 +76,4 @@ CONFIG_SHA256=y
CONFIG_MD5=y
CONFIG_GETOPT=y
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_SPL_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index e2c1665db5..05d955696b 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -15,9 +15,9 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen"
CONFIG_SPL_TEXT_BASE=0x02021410
CONFIG_SPL=y
CONFIG_IDENT_STRING=" for ORIGEN"
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_SYS_LOAD_ADDR=0x43e00000
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_BOOTCOMMAND="if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadbootscript; then run bootscript; fi; fi;load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/poleg_evb_defconfig b/configs/poleg_evb_defconfig
index f7bdefcf93..94bb34a3a7 100644
--- a/configs/poleg_evb_defconfig
+++ b/configs/poleg_evb_defconfig
@@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0x100000
CONFIG_ENV_SECT_SIZE=0x4000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="nuvoton-npcm750-evb"
-CONFIG_ARCH_NPCM7xx=y
CONFIG_TARGET_POLEG=y
CONFIG_SYS_LOAD_ADDR=0x10000000
CONFIG_ENV_ADDR=0x80100000
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 79ed253570..e7bd1ae047 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -12,9 +12,9 @@ CONFIG_NR_DRAM_BANKS=2
CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x7000
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210"
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_SYS_LOAD_ADDR=0x44800000
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="Please use defined boot"
CONFIG_BOOTCOMMAND="run mmcboot"
diff --git a/configs/sam9x60_curiosity_mmc_defconfig b/configs/sam9x60_curiosity_mmc_defconfig
index 06db619270..dd884bf8aa 100644
--- a/configs/sam9x60_curiosity_mmc_defconfig
+++ b/configs/sam9x60_curiosity_mmc_defconfig
@@ -13,8 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="at91-sam9x60_curiosity"
CONFIG_DEBUG_UART_BOARD_INIT=y
CONFIG_DEBUG_UART_BASE=0xfffff200
CONFIG_DEBUG_UART_CLOCK=200000000
-CONFIG_DEBUG_UART=y
CONFIG_SYS_LOAD_ADDR=0x22000000
+CONFIG_DEBUG_UART=y
CONFIG_FIT=y
CONFIG_SD_BOOT=y
CONFIG_BOOTDELAY=3
@@ -30,7 +30,6 @@ CONFIG_SYS_PROMPT="U-Boot> "
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_CLK=y
CONFIG_CMD_DM=y
-# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
@@ -58,7 +57,6 @@ CONFIG_DM_I2C=y
CONFIG_SYS_I2C_AT91=y
CONFIG_I2C_EEPROM=y
CONFIG_MICROCHIP_FLEXCOM=y
-CONFIG_DM_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ATMEL=y
CONFIG_PHY_MICREL=y
diff --git a/configs/sam9x60ek_mmc_defconfig b/configs/sam9x60ek_mmc_defconfig
index dee112ab67..bc0164c38e 100644
--- a/configs/sam9x60ek_mmc_defconfig
+++ b/configs/sam9x60ek_mmc_defconfig
@@ -75,10 +75,9 @@ CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_W1=y
CONFIG_W1_GPIO=y
diff --git a/configs/sam9x60ek_nandflash_defconfig b/configs/sam9x60ek_nandflash_defconfig
index ca848e1aa8..5c34f089e6 100644
--- a/configs/sam9x60ek_nandflash_defconfig
+++ b/configs/sam9x60ek_nandflash_defconfig
@@ -76,11 +76,10 @@ CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
-CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
+CONFIG_ATMEL_PIT_TIMER=y
CONFIG_W1=y
CONFIG_W1_GPIO=y
CONFIG_W1_EEPROM=y
diff --git a/configs/sam9x60ek_qspiflash_defconfig b/configs/sam9x60ek_qspiflash_defconfig
index b8cacaff75..1a64b2948f 100644
--- a/configs/sam9x60ek_qspiflash_defconfig
+++ b/configs/sam9x60ek_qspiflash_defconfig
@@ -88,11 +88,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
-CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
+CONFIG_ATMEL_PIT_TIMER=y
CONFIG_W1=y
CONFIG_W1_GPIO=y
CONFIG_W1_EEPROM=y
diff --git a/configs/sama5d27_giantboard_defconfig b/configs/sama5d27_giantboard_defconfig
index 4855e0f072..4977189716 100644
--- a/configs/sama5d27_giantboard_defconfig
+++ b/configs/sama5d27_giantboard_defconfig
@@ -74,6 +74,9 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
+CONFIG_SYSRESET_AT91=y
CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
@@ -84,7 +87,3 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_SYSRESET=y
-CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
-CONFIG_SYSRESET_AT91=y
diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig
index d0ff6a9012..3e8c7b5d11 100644
--- a/configs/sama5d27_som1_ek_mmc1_defconfig
+++ b/configs/sama5d27_som1_ek_mmc1_defconfig
@@ -88,11 +88,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig
index 8096ec7b61..4a9a1f9bdf 100644
--- a/configs/sama5d27_som1_ek_mmc_defconfig
+++ b/configs/sama5d27_som1_ek_mmc_defconfig
@@ -88,11 +88,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig
index e0b11e9198..a20272fe42 100644
--- a/configs/sama5d27_som1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_som1_ek_qspiflash_defconfig
@@ -87,11 +87,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d27_wlsom1_ek_mmc_defconfig b/configs/sama5d27_wlsom1_ek_mmc_defconfig
index a0e37fa74d..05a2e412a6 100644
--- a/configs/sama5d27_wlsom1_ek_mmc_defconfig
+++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig
@@ -93,11 +93,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index 8acb8f2242..691b0c21fc 100644
--- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@ -97,11 +97,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig
index 37f2798608..bb70c10e25 100644
--- a/configs/sama5d2_icp_mmc_defconfig
+++ b/configs/sama5d2_icp_mmc_defconfig
@@ -79,11 +79,10 @@ CONFIG_PINCTRL_AT91PIO4=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_SPL_ATMEL_TCB_TIMER=y
diff --git a/configs/sama5d2_icp_qspiflash_defconfig b/configs/sama5d2_icp_qspiflash_defconfig
index cac96e638c..715691844f 100644
--- a/configs/sama5d2_icp_qspiflash_defconfig
+++ b/configs/sama5d2_icp_qspiflash_defconfig
@@ -86,10 +86,9 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
@@ -97,5 +96,4 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_SPL_OF_LIBFDT=y
# CONFIG_EFI_LOADER_HII is not set
diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig
index 27618bbefe..542d667d7e 100644
--- a/configs/sama5d2_ptc_ek_mmc_defconfig
+++ b/configs/sama5d2_ptc_ek_mmc_defconfig
@@ -69,10 +69,9 @@ CONFIG_PINCTRL_AT91PIO4=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig
index cd66b60586..e1887e14b1 100644
--- a/configs/sama5d2_ptc_ek_nandflash_defconfig
+++ b/configs/sama5d2_ptc_ek_nandflash_defconfig
@@ -69,10 +69,9 @@ CONFIG_PINCTRL_AT91PIO4=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig
index 06b337ef8b..081f5f9d9c 100644
--- a/configs/sama5d2_xplained_emmc_defconfig
+++ b/configs/sama5d2_xplained_emmc_defconfig
@@ -87,11 +87,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_SPL_ATMEL_TCB_TIMER=y
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index 871ade2135..255fb0fa7d 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -89,11 +89,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_SPL_ATMEL_TCB_TIMER=y
diff --git a/configs/sama5d2_xplained_qspiflash_defconfig b/configs/sama5d2_xplained_qspiflash_defconfig
index 59f62c51d7..5bd4d69332 100644
--- a/configs/sama5d2_xplained_qspiflash_defconfig
+++ b/configs/sama5d2_xplained_qspiflash_defconfig
@@ -89,11 +89,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_SPL_ATMEL_TCB_TIMER=y
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
index ec2091d1b0..b1c27e9851 100644
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -93,11 +93,10 @@ CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_ATMEL_QSPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_TCB_TIMER=y
CONFIG_SPL_ATMEL_TCB_TIMER=y
diff --git a/configs/sama5d36ek_cmp_mmc_defconfig b/configs/sama5d36ek_cmp_mmc_defconfig
index 7c31b75ace..256ab76b07 100644
--- a/configs/sama5d36ek_cmp_mmc_defconfig
+++ b/configs/sama5d36ek_cmp_mmc_defconfig
@@ -64,10 +64,9 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_DM_VIDEO=y
# CONFIG_VIDEO_BPP8 is not set
diff --git a/configs/sama5d36ek_cmp_nandflash_defconfig b/configs/sama5d36ek_cmp_nandflash_defconfig
index 00f5b2bd80..d89b539ccf 100644
--- a/configs/sama5d36ek_cmp_nandflash_defconfig
+++ b/configs/sama5d36ek_cmp_nandflash_defconfig
@@ -66,10 +66,9 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_DM_VIDEO=y
# CONFIG_VIDEO_BPP8 is not set
diff --git a/configs/sama5d36ek_cmp_spiflash_defconfig b/configs/sama5d36ek_cmp_spiflash_defconfig
index 1a6e47b3f9..9fbed91b84 100644
--- a/configs/sama5d36ek_cmp_spiflash_defconfig
+++ b/configs/sama5d36ek_cmp_spiflash_defconfig
@@ -66,10 +66,9 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_DM_VIDEO=y
# CONFIG_VIDEO_BPP8 is not set
diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig
index ff74988f46..b9b938bab7 100644
--- a/configs/sama5d3_xplained_mmc_defconfig
+++ b/configs/sama5d3_xplained_mmc_defconfig
@@ -83,11 +83,10 @@ CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig
index ba7ffd47d7..d8dd849dc0 100644
--- a/configs/sama5d3_xplained_nandflash_defconfig
+++ b/configs/sama5d3_xplained_nandflash_defconfig
@@ -86,11 +86,10 @@ CONFIG_PINCTRL_AT91=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig
index 4c8294252c..2dbf9abf4c 100644
--- a/configs/sama5d3xek_mmc_defconfig
+++ b/configs/sama5d3xek_mmc_defconfig
@@ -91,11 +91,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d3xek_nandflash_defconfig b/configs/sama5d3xek_nandflash_defconfig
index 977eafd5c3..27ab84c3a3 100644
--- a/configs/sama5d3xek_nandflash_defconfig
+++ b/configs/sama5d3xek_nandflash_defconfig
@@ -93,11 +93,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig
index f2c5576c22..6a4230207d 100644
--- a/configs/sama5d3xek_spiflash_defconfig
+++ b/configs/sama5d3xek_spiflash_defconfig
@@ -92,11 +92,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
index d147c3e0c3..c217d6d439 100644
--- a/configs/sama5d4_xplained_mmc_defconfig
+++ b/configs/sama5d4_xplained_mmc_defconfig
@@ -84,11 +84,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
index 8db8ee36d5..5c62a7f6ae 100644
--- a/configs/sama5d4_xplained_nandflash_defconfig
+++ b/configs/sama5d4_xplained_nandflash_defconfig
@@ -88,11 +88,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
index 0407f7d576..60bd2eb8f1 100644
--- a/configs/sama5d4_xplained_spiflash_defconfig
+++ b/configs/sama5d4_xplained_spiflash_defconfig
@@ -90,11 +90,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig
index d143569c96..c36175c8ce 100644
--- a/configs/sama5d4ek_mmc_defconfig
+++ b/configs/sama5d4ek_mmc_defconfig
@@ -82,11 +82,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d4ek_nandflash_defconfig b/configs/sama5d4ek_nandflash_defconfig
index 3a037b93b9..7c544017cf 100644
--- a/configs/sama5d4ek_nandflash_defconfig
+++ b/configs/sama5d4ek_nandflash_defconfig
@@ -86,11 +86,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig
index fb4c58c434..0b86976df9 100644
--- a/configs/sama5d4ek_spiflash_defconfig
+++ b/configs/sama5d4ek_spiflash_defconfig
@@ -85,11 +85,10 @@ CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_ATMEL_PIT_TIMER=y
CONFIG_SPL_ATMEL_PIT_TIMER=y
diff --git a/configs/sama7g5ek_mmc1_defconfig b/configs/sama7g5ek_mmc1_defconfig
index 31db8c1d5e..42d96f7c02 100644
--- a/configs/sama7g5ek_mmc1_defconfig
+++ b/configs/sama7g5ek_mmc1_defconfig
@@ -70,10 +70,9 @@ CONFIG_PINCTRL_AT91PIO4=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_MCHP_PIT64B_TIMER=y
CONFIG_OF_LIBFDT_OVERLAY=y
# CONFIG_EFI_LOADER_HII is not set
diff --git a/configs/sama7g5ek_mmc_defconfig b/configs/sama7g5ek_mmc_defconfig
index 2e5e78e7b6..e03a6ba9af 100644
--- a/configs/sama7g5ek_mmc_defconfig
+++ b/configs/sama7g5ek_mmc_defconfig
@@ -70,10 +70,9 @@ CONFIG_PINCTRL_AT91PIO4=y
CONFIG_DM_SERIAL=y
CONFIG_DEBUG_UART_ANNOUNCE=y
CONFIG_ATMEL_USART=y
-CONFIG_TIMER=y
CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
CONFIG_SYSRESET_AT91=y
+CONFIG_TIMER=y
CONFIG_MCHP_PIT64B_TIMER=y
CONFIG_OF_LIBFDT_OVERLAY=y
# CONFIG_EFI_LOADER_HII is not set
diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig
index 3f6a0519c8..642c199c5c 100644
--- a/configs/stih410-b2260_defconfig
+++ b/configs/stih410-b2260_defconfig
@@ -65,4 +65,3 @@ CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics"
CONFIG_USB_GADGET_VENDOR_NUM=0x483
CONFIG_USB_GADGET_PRODUCT_NUM=0x7270
CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_SPL_OF_LIBFDT=y
diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 9a03a0a7a3..111392d9a9 100644
--- a/configs/theadorable_debug_defconfig
+++ b/configs/theadorable_debug_defconfig
@@ -16,10 +16,10 @@ CONFIG_SPL_SERIAL=y
CONFIG_SPL=y
CONFIG_DEBUG_UART_BASE=0xd0012000
CONFIG_DEBUG_UART_CLOCK=250000000
+CONFIG_SYS_MEM_TOP_HIDE=0x80000
CONFIG_SYS_LOAD_ADDR=0x800000
CONFIG_DEBUG_UART=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_MEM_TOP_HIDE=0x80000
CONFIG_FIT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_PREBOOT=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 588826c2b6..6c43a02cb0 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -11,10 +11,10 @@ CONFIG_TARGET_TRATS2=y
CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x7000
CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2"
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_SYS_LOAD_ADDR=0x43e00000
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_USE_BOOTARGS=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 85a9d60bbe..5990dc1226 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -11,9 +11,9 @@ CONFIG_TARGET_TRATS=y
CONFIG_ENV_SIZE=0x1000
CONFIG_ENV_OFFSET=0x7000
CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats"
+CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_SYS_LOAD_ADDR=0x44800000
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_MEM_TOP_HIDE=0x100000
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_USE_BOOTARGS=y
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
index 1394a1925e..e1e1f95382 100644
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -48,6 +48,8 @@ CONFIG_ETH_DESIGNWARE=y
CONFIG_MACB=y
CONFIG_RMII=y
CONFIG_ATMEL_USART=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_AT91=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_HOST_ETHER=y
@@ -56,6 +58,3 @@ CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="L+G VInCo"
CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_USB_ETHER=y
-CONFIG_SYSRESET=y
-CONFIG_SYSRESET_CMD_RESET=y
-CONFIG_SYSRESET_AT91=y
--
2.39.5