diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-03-26 09:30:53 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-04-14 03:21:43 -0400 |
commit | f661e7733f8c45692147ea52a16c9c1856cf152b (patch) | |
tree | 8103c66bf38d4abc7f5699239c4ce7a00059f538 /arch | |
parent | ccc3e2a463e25ccbbd6cc4dcfff23b8c81c669dc (diff) |
ARM: u300: u300_defconfig: Enable PARTITION_ADVANCED
Since there are SD-card support in u300, it's reasonable to
support partitions for block devices as default.
While updating the defconfig, we rebase it towards Kconfig changes.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/u300_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig index fd81a1b99cce..aaa95ab606a8 100644 --- a/arch/arm/configs/u300_defconfig +++ b/arch/arm/configs/u300_defconfig | |||
@@ -11,6 +11,7 @@ CONFIG_MODULES=y | |||
11 | CONFIG_MODULE_UNLOAD=y | 11 | CONFIG_MODULE_UNLOAD=y |
12 | # CONFIG_LBDAF is not set | 12 | # CONFIG_LBDAF is not set |
13 | # CONFIG_BLK_DEV_BSG is not set | 13 | # CONFIG_BLK_DEV_BSG is not set |
14 | CONFIG_PARTITION_ADVANCED=y | ||
14 | # CONFIG_IOSCHED_CFQ is not set | 15 | # CONFIG_IOSCHED_CFQ is not set |
15 | # CONFIG_ARCH_MULTI_V7 is not set | 16 | # CONFIG_ARCH_MULTI_V7 is not set |
16 | CONFIG_ARCH_U300=y | 17 | CONFIG_ARCH_U300=y |
@@ -21,7 +22,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
21 | CONFIG_ZBOOT_ROM_BSS=0x0 | 22 | CONFIG_ZBOOT_ROM_BSS=0x0 |
22 | CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072" | 23 | CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072" |
23 | CONFIG_CPU_IDLE=y | 24 | CONFIG_CPU_IDLE=y |
24 | CONFIG_FPE_NWFPE=y | ||
25 | # CONFIG_SUSPEND is not set | 25 | # CONFIG_SUSPEND is not set |
26 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 26 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
27 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 27 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
@@ -64,8 +64,8 @@ CONFIG_TMPFS=y | |||
64 | CONFIG_NLS_CODEPAGE_437=y | 64 | CONFIG_NLS_CODEPAGE_437=y |
65 | CONFIG_NLS_ISO8859_1=y | 65 | CONFIG_NLS_ISO8859_1=y |
66 | CONFIG_PRINTK_TIME=y | 66 | CONFIG_PRINTK_TIME=y |
67 | CONFIG_DEBUG_INFO=y | ||
67 | CONFIG_DEBUG_FS=y | 68 | CONFIG_DEBUG_FS=y |
68 | # CONFIG_SCHED_DEBUG is not set | 69 | # CONFIG_SCHED_DEBUG is not set |
69 | CONFIG_TIMER_STATS=y | 70 | CONFIG_TIMER_STATS=y |
70 | # CONFIG_DEBUG_PREEMPT is not set | 71 | # CONFIG_DEBUG_PREEMPT is not set |
71 | CONFIG_DEBUG_INFO=y | ||