Skip to content

Commit 58aa4eb

Browse files
committed
ARM: u300: update defconfig
This updates the U300 defconfig to support some new drivers like FSMC, sets it to use the MMC clock gating scheme, and removes some stale config options. Signed-off-by: Linus Walleij <[email protected]>
1 parent caca6a0 commit 58aa4eb

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

arch/arm/configs/u300_defconfig

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ CONFIG_MODULE_UNLOAD=y
1414
CONFIG_ARCH_U300=y
1515
CONFIG_MACH_U300=y
1616
CONFIG_MACH_U300_BS335=y
17-
CONFIG_MACH_U300_DUAL_RAM=y
18-
CONFIG_U300_DEBUG=y
1917
CONFIG_MACH_U300_SPIDUMMY=y
2018
CONFIG_NO_HZ=y
2119
CONFIG_HIGH_RES_TIMERS=y
@@ -26,19 +24,21 @@ CONFIG_ZBOOT_ROM_BSS=0x0
2624
CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072"
2725
CONFIG_CPU_IDLE=y
2826
CONFIG_FPE_NWFPE=y
29-
CONFIG_PM=y
3027
# CONFIG_SUSPEND is not set
3128
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
3229
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
33-
# CONFIG_MISC_DEVICES is not set
30+
CONFIG_MTD=y
31+
CONFIG_MTD_CMDLINE_PARTS=y
32+
CONFIG_MTD_NAND=y
33+
CONFIG_MTD_NAND_FSMC=y
3434
# CONFIG_INPUT_MOUSEDEV is not set
3535
CONFIG_INPUT_EVDEV=y
3636
# CONFIG_KEYBOARD_ATKBD is not set
3737
# CONFIG_INPUT_MOUSE is not set
3838
# CONFIG_SERIO is not set
39+
CONFIG_LEGACY_PTY_COUNT=16
3940
CONFIG_SERIAL_AMBA_PL011=y
4041
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
41-
CONFIG_LEGACY_PTY_COUNT=16
4242
# CONFIG_HW_RANDOM is not set
4343
CONFIG_I2C=y
4444
# CONFIG_HWMON is not set
@@ -51,6 +51,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
5151
# CONFIG_HID_SUPPORT is not set
5252
# CONFIG_USB_SUPPORT is not set
5353
CONFIG_MMC=y
54+
CONFIG_MMC_CLKGATE=y
5455
CONFIG_MMC_ARMMMCI=y
5556
CONFIG_RTC_CLASS=y
5657
# CONFIG_RTC_HCTOSYS is not set
@@ -65,10 +66,8 @@ CONFIG_NLS_CODEPAGE_437=y
6566
CONFIG_NLS_ISO8859_1=y
6667
CONFIG_PRINTK_TIME=y
6768
CONFIG_DEBUG_FS=y
68-
CONFIG_DEBUG_KERNEL=y
6969
# CONFIG_SCHED_DEBUG is not set
7070
CONFIG_TIMER_STATS=y
7171
# CONFIG_DEBUG_PREEMPT is not set
7272
CONFIG_DEBUG_INFO=y
73-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
7473
# CONFIG_CRC32 is not set

0 commit comments

Comments
 (0)