summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@microchip.com>2021-02-05 14:15:09 +0300
committerNicolas Ferre <nicolas.ferre@microchip.com>2021-02-05 15:10:59 +0300
commitc0b80a6247a3ab33d728e572f771bcefbef497c0 (patch)
treefe4de28af7a79e627d55b4fa1cc2d4bf6c9a5380 /arch/arm
parentbc06f0943bd93dd8c7e2f763f792074ce79c5b64 (diff)
downloadlinux-c0b80a6247a3ab33d728e572f771bcefbef497c0.tar.xz
ARM: configs: at91: DT/ATAG defconfig modifications
As all AT91 platforms are converted to DT for a long time, adapt the defconfigs by: - removing legacy CONFIG_ATAGS as a DT will always be provided; - removing the CONFIG_ARM_APPENDED_DTB option on SAMA5 devices as the vast majority of systems will use a DT-aware bootloader on these devices. Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/at91_dt_defconfig1
-rw-r--r--arch/arm/configs/sama5_defconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index e274f8c492d2..3e4adbd30a53 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -17,6 +17,7 @@ CONFIG_SOC_SAM9X60=y
# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set
CONFIG_AEABI=y
CONFIG_UACCESS_WITH_MEMCPY=y
+# CONFIG_ATAGS is not set
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 64573caa0ecd..b72bd38a1c45 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -19,7 +19,7 @@ CONFIG_SOC_SAMA5D3=y
CONFIG_SOC_SAMA5D4=y
# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set
CONFIG_UACCESS_WITH_MEMCPY=y
-CONFIG_ARM_APPENDED_DTB=y
+# CONFIG_ATAGS is not set
CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
CONFIG_KEXEC=y
CONFIG_VFP=y