Commit 186d24bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: defconfig: remove stale CONFIG_ZBOOT_ROM entries 



The default is always 0x0 after commit 39c3e304 ("ARM: 8984/1:
Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0"), so any
defconfig file that has these two lines can now drop them to reduce
the diff against the 'make savedefconfig' version.

Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f0993936

arch/arm/configs/am200epdkit_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ CONFIG_ARCH_PXA=y 
CONFIG_ARCH_GUMSTIX=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,115200n8 root=1f01 rootfstype=jffs2"

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

arch/arm/configs/assabet_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ CONFIG_ARCH_SA1100=y 
CONFIG_SA1100_ASSABET=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="mem=32M console=ttySA0,38400n8 initrd=0xc0800000,3M root=/dev/ram"

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

arch/arm/configs/axm55xx_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_AEABI=y

CONFIG_OABI_COMPAT=y

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_VFP=y

arch/arm/configs/badge4_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_EXPERT=y

CONFIG_ARCH_SA1100=y

CONFIG_SA1100_BADGE4=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="init=/linuxrc root=/dev/mtdblock3"

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

CONFIG_FPE_NWFPE=y

arch/arm/configs/cerfcube_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ CONFIG_SA1100_CERF=y 
CONFIG_SA1100_CERF_FLASH_16MB=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySA0,38400 root=/dev/mtdblock3 rootfstype=jffs2 rw mem=32M init=/linuxrc"

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=m