tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nomadik-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
From Linus Walleij:
This updates the Nomadik defconfig post-v3.11-rc1:
- Update the baseline so we need not rely on make
oldconfig so much
- MMC defconfig updates
- Activate NO_HZ_IDLE and HRTIMERS
* tag 'nomadik-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: configure for NO_HZ and HRTIMERS
ARM: nomadik: update defconfig base
ARM: nomadik: Update MMC defconfigs
Signed-off-by: Olof Johansson <olof@lixom.net>
+5
-2
+5
-2
arch/arm/configs/nhk8815_defconfig
+5
-2
arch/arm/configs/nhk8815_defconfig
···
1
1
# CONFIG_LOCALVERSION_AUTO is not set
2
2
# CONFIG_SWAP is not set
3
3
CONFIG_SYSVIPC=y
4
+
CONFIG_NO_HZ_IDLE=y
5
+
CONFIG_HIGH_RES_TIMERS=y
4
6
CONFIG_IKCONFIG=y
5
7
CONFIG_IKCONFIG_PROC=y
6
8
CONFIG_LOG_BUF_SHIFT=14
···
50
48
CONFIG_MTD=y
51
49
CONFIG_MTD_TESTS=m
52
50
CONFIG_MTD_CMDLINE_PARTS=y
53
-
CONFIG_MTD_CHAR=y
54
51
CONFIG_MTD_BLOCK=y
55
52
CONFIG_MTD_NAND_ECC_SMC=y
56
53
CONFIG_MTD_NAND=y
···
95
94
CONFIG_I2C_NOMADIK=y
96
95
CONFIG_DEBUG_GPIO=y
97
96
# CONFIG_HWMON is not set
97
+
CONFIG_REGULATOR=y
98
98
CONFIG_MMC=y
99
-
CONFIG_MMC_CLKGATE=y
99
+
CONFIG_MMC_UNSAFE_RESUME=y
100
+
# CONFIG_MMC_BLOCK_BOUNCE is not set
100
101
CONFIG_MMC_ARMMMCI=y
101
102
CONFIG_NEW_LEDS=y
102
103
CONFIG_LEDS_CLASS=y