summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2013-08-31 14:57:31 +0200
committerOlof Johansson <olof@lixom.net>2013-10-28 21:25:54 +0100
commit0ffae27f0f29e877ce52e4794a99926167792378 (patch)
tree55374602f42fff87d03a4e75c83037314c5c6f2b /arch/arm/configs
parentMerge tag 'imx-soc-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 in... (diff)
downloadlinux-0ffae27f0f29e877ce52e4794a99926167792378.tar.xz
linux-0ffae27f0f29e877ce52e4794a99926167792378.zip
ARM: vexpress: Make defconfig work again
This patch updates the Versatile Express defconfig to a level which makes it possible to run a defconfig-ed kernel work on the board and in QEMU with modern userspace. It does: - update cmdline to contain "console=ttyAMA0" only - enable devtmpfs filesystem - enable voltage regulator support - enable ext4 filesystem - disable low level debug and early printk Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> [PM: removed DEBUG_LL - it doesn't work on qemu] [PM: reworded the commit message] Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/vexpress_defconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig
index f2de51f0bd18..6d20bc1cb844 100644
--- a/arch/arm/configs/vexpress_defconfig
+++ b/arch/arm/configs/vexpress_defconfig
@@ -30,7 +30,7 @@ CONFIG_HOTPLUG_CPU=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
+CONFIG_CMDLINE="console=ttyAMA0"
CONFIG_VFP=y
CONFIG_NEON=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -45,6 +45,7 @@ CONFIG_IP_PNP_BOOTP=y
# CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
CONFIG_MTD=y
CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
@@ -75,6 +76,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_LEGACY_PTY_COUNT=16
# CONFIG_HW_RANDOM is not set
# CONFIG_HWMON is not set
+CONFIG_REGULATOR=y
CONFIG_FB=y
CONFIG_FB_ARMCLCD=y
CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -115,6 +117,7 @@ CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_EXT4_FS=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_JFFS2_FS=y
@@ -134,7 +137,5 @@ CONFIG_DEBUG_INFO=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set