mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 22:14:03 +02:00
ARM: turn CONFIG_ATAGS off by default
Only a very small number of machines remain that rely on traditional board files with the ATAGS boot data instead of devicetree, and we have not accepted new ones for a decade. Most of the remaining ones are on their way out of the kernel, but the Kconfig option that controls ATAGS is still enabled by default. To reflect the actual status of ATAGS support and alert the remaining users of upstream and out-of-tree platforms with this, change it to being default-disabled and add a dependency on CONFIG_EXPERT. The board specific defconfig files that rely on ATAGS are changed to turn on both EXPERT and ATAGS if they were not doing that already, and the ones that explicitly turned it off before no longer need to. Acked-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Ethan Nelson-Moore <enelsonmoore@gmail.com> Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi> # OMAP Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
b5fdfa2081
commit
db75f16378
|
|
@ -1390,12 +1390,15 @@ config ARCH_WANT_FLAT_DTB_INSTALL
|
|||
|
||||
config ATAGS
|
||||
bool "Support for the traditional ATAGS boot data passing"
|
||||
default y
|
||||
depends on EXPERT
|
||||
help
|
||||
This is the traditional way of passing data to the kernel at boot
|
||||
time. If you are solely relying on the flattened device tree (or
|
||||
the ARM_ATAG_DTB_COMPAT option) then you may unselect this option
|
||||
to remove ATAGS support from your kernel binary.
|
||||
This is the traditional way of passing data to the kernel at
|
||||
boot but is now only used by a few of the oldest ARMv4 and
|
||||
ARMv5 machines. Users that still rely on ATAGS should plan
|
||||
on migrating to devicetree based booting.
|
||||
|
||||
Support for ATAGS will be removed when the last machine using
|
||||
it is either converted to DT or removed.
|
||||
|
||||
config DEPRECATED_PARAM_STRUCT
|
||||
bool "Provide old way to pass kernel parameters"
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ CONFIG_EXPERT=y
|
|||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_PXA=y
|
||||
CONFIG_ARCH_GUMSTIX=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2"
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ CONFIG_ARCH_ASPEED=y
|
|||
CONFIG_MACH_ASPEED_G4=y
|
||||
CONFIG_VMSPLIT_2G=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_JUMP_LABEL=y
|
||||
CONFIG_STRICT_KERNEL_RWX=y
|
||||
# CONFIG_BLK_DEBUG_FS is not set
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ CONFIG_VMSPLIT_2G=y
|
|||
CONFIG_NR_CPUS=2
|
||||
CONFIG_HIGHMEM=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_VFP=y
|
||||
CONFIG_NEON=y
|
||||
CONFIG_KERNEL_MODE_NEON=y
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_ASSABET=y
|
||||
# CONFIG_AEABI is not set
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_CMDLINE="mem=32M console=ttySA0,38400n8 initrd=0xc0800000,3M root=/dev/ram"
|
||||
CONFIG_FPE_NWFPE=y
|
||||
CONFIG_PM=y
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ CONFIG_SOC_SAM9X60=y
|
|||
CONFIG_SOC_SAM9X7=y
|
||||
# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ CONFIG_ARCH_MULTI_V4=y
|
|||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_COLLIE=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1"
|
||||
CONFIG_PM=y
|
||||
# CONFIG_SWAP is not set
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ CONFIG_ARCH_MULTI_V7=y
|
|||
CONFIG_ARCH_DOVE=y
|
||||
CONFIG_MACH_CM_A510=y
|
||||
CONFIG_HIGHMEM=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
||||
CONFIG_VFP=y
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ CONFIG_ARCH_MULTI_V4=y
|
|||
CONFIG_ARCH_FOOTBRIDGE=y
|
||||
CONFIG_ARCH_EBSA285_HOST=y
|
||||
CONFIG_ARCH_NETWINDER=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_FPE_NWFPE=y
|
||||
CONFIG_FPE_NWFPE_XP=y
|
||||
# CONFIG_AEABI is not set
|
||||
|
|
|
|||
|
|
@ -4,11 +4,13 @@ CONFIG_HIGH_RES_TIMERS=y
|
|||
CONFIG_PREEMPT=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_H3600=y
|
||||
# CONFIG_CPU_FREQ_STAT is not set
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_UNIX=y
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ CONFIG_ARCH_INTEGRATOR=y
|
|||
CONFIG_ARCH_INTEGRATOR_AP=y
|
||||
CONFIG_INTEGRATOR_IMPD1=y
|
||||
CONFIG_ARCH_INTEGRATOR_CP=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_CMDLINE="console=ttyAM0,38400n8 root=/dev/nfs ip=bootp"
|
||||
CONFIG_CPU_FREQ=y
|
||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_JORNADA720=y
|
||||
CONFIG_SA1100_JORNADA720_SSP=y
|
||||
CONFIG_PM=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_PACKET=y
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ CONFIG_ARCH_MULTI_V4=y
|
|||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_MOXART=y
|
||||
CONFIG_MACH_UC7112LX=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
# CONFIG_SWAP is not set
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ CONFIG_ARCH_MPS2=y
|
|||
CONFIG_SET_MEM_PARAM=y
|
||||
CONFIG_DRAM_BASE=0x21000000
|
||||
CONFIG_DRAM_SIZE=0x1000000
|
||||
# CONFIG_ATAGS is not set
|
||||
# CONFIG_SUSPEND is not set
|
||||
# CONFIG_BLOCK is not set
|
||||
CONFIG_BINFMT_FLAT=y
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ CONFIG_INTEGRATOR_IMPD1=y
|
|||
CONFIG_INTEGRATOR_CM720T=y
|
||||
CONFIG_INTEGRATOR_CM920T=y
|
||||
CONFIG_INTEGRATOR_CM922T_XA10=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_CPU_IDLE=y
|
||||
CONFIG_ARM_CPUIDLE=y
|
||||
CONFIG_ARM_CLPS711X_CPUIDLE=y
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ CONFIG_ARCH_MULTI_V5=y
|
|||
CONFIG_ARCH_MV78XX0=y
|
||||
CONFIG_MACH_TERASTATION_WXL=y
|
||||
CONFIG_HIGHMEM=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_VFP=y
|
||||
CONFIG_KPROBES=y
|
||||
CONFIG_MODULES=y
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_ASSABET=y
|
||||
CONFIG_ASSABET_NEPONSET=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_ZBOOT_ROM_TEXT=0x80000
|
||||
CONFIG_ZBOOT_ROM_BSS=0xc1000000
|
||||
CONFIG_ZBOOT_ROM=y
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_FOOTBRIDGE=y
|
||||
CONFIG_ARCH_NETWINDER=y
|
||||
# CONFIG_AEABI is not set
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_DEPRECATED_PARAM_STRUCT=y
|
||||
CONFIG_CMDLINE="root=0x801"
|
||||
CONFIG_FPE_NWFPE=y
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ CONFIG_MACH_OMAP_PALMTE=y
|
|||
CONFIG_MACH_SX1=y
|
||||
CONFIG_MACH_NOKIA770=y
|
||||
CONFIG_MACH_AMS_DELTA=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_CMDLINE="root=1f03 rootfstype=jffs2"
|
||||
# CONFIG_SUSPEND is not set
|
||||
CONFIG_PM=y
|
||||
|
|
|
|||
|
|
@ -2,12 +2,14 @@
|
|||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_RPC=y
|
||||
CONFIG_CPU_SA110=y
|
||||
CONFIG_FPE_NWFPE=y
|
||||
# CONFIG_AEABI is not set
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_PARTITION_ADVANCED=y
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@ CONFIG_BLK_DEV_INITRD=y
|
|||
CONFIG_KALLSYMS_ALL=y
|
||||
CONFIG_ARCH_MULTI_V6=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_S3C64XX=y
|
||||
CONFIG_MACH_WLF_CRAGG_6410=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"
|
||||
CONFIG_VFP=y
|
||||
CONFIG_MODULES=y
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ CONFIG_SOC_SAMA5D3=y
|
|||
CONFIG_SOC_SAMA5D4=y
|
||||
# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
|
||||
CONFIG_VFP=y
|
||||
CONFIG_NEON=y
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ CONFIG_ATMEL_CLOCKSOURCE_TCB=y
|
|||
# CONFIG_CPU_SW_DOMAIN_PAN is not set
|
||||
CONFIG_ARCH_FORCE_MAX_ORDER=14
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk ignore_loglevel"
|
||||
CONFIG_CPU_FREQ=y
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ CONFIG_ARCH_PXA=y
|
|||
CONFIG_PXA_SHARPSL=y
|
||||
CONFIG_MACH_AKITA=y
|
||||
CONFIG_MACH_BORZOI=y
|
||||
CONFIG_ATAGS=y
|
||||
CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug"
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ CONFIG_ARCH_STM32=y
|
|||
CONFIG_CPU_V7M_NUM_IRQ=240
|
||||
CONFIG_SET_MEM_PARAM=y
|
||||
CONFIG_DRAM_BASE=0x90000000
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_XIP_KERNEL=y
|
||||
CONFIG_XIP_PHYS_ADDR=0x08008000
|
||||
# CONFIG_SUSPEND is not set
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ CONFIG_ARCH_NPCM=y
|
|||
CONFIG_ARCH_WPCM450=y
|
||||
CONFIG_CPU_DCACHE_WRITETHROUGH=y
|
||||
CONFIG_UACCESS_WITH_MEMCPY=y
|
||||
# CONFIG_ATAGS is not set
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_CPU_IDLE=y
|
||||
CONFIG_KPROBES=y
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user