aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-20 01:30:56 -0500
committerOlof Johansson <olof@lixom.net>2012-11-20 01:31:12 -0500
commit1443f8a0b95c07cee9df4420a30eea24123af3f3 (patch)
tree73a10165643ea9951841c58e3db697550c19fe5e /arch/arm/configs
parent00b2fa57d50fde1f5d7c3ac0893e49d69c315414 (diff)
parent001b35fff5d8b0d99a5ae16d8126d501b73cf8aa (diff)
Merge tag 'davinci-for-v3.8/defconfig' of git://gitorious.org/linux-davinci/linux-davinci into next/boards
From Sekhar Nori: This change enables DT related options in DA8XX defconfig. * tag 'davinci-for-v3.8/defconfig' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: da8xx defconfig: enable DT config options Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/da8xx_omapl_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig
index 88ccde058ba4..f29223954af8 100644
--- a/arch/arm/configs/da8xx_omapl_defconfig
+++ b/arch/arm/configs/da8xx_omapl_defconfig
@@ -17,6 +17,7 @@ CONFIG_MODVERSIONS=y
17CONFIG_ARCH_DAVINCI=y 17CONFIG_ARCH_DAVINCI=y
18CONFIG_ARCH_DAVINCI_DA830=y 18CONFIG_ARCH_DAVINCI_DA830=y
19CONFIG_ARCH_DAVINCI_DA850=y 19CONFIG_ARCH_DAVINCI_DA850=y
20CONFIG_MACH_DA8XX_DT=y
20CONFIG_MACH_MITYOMAPL138=y 21CONFIG_MACH_MITYOMAPL138=y
21CONFIG_MACH_OMAPL138_HAWKBOARD=y 22CONFIG_MACH_OMAPL138_HAWKBOARD=y
22CONFIG_DAVINCI_RESET_CLOCKS=y 23CONFIG_DAVINCI_RESET_CLOCKS=y
@@ -26,6 +27,7 @@ CONFIG_PREEMPT=y
26CONFIG_AEABI=y 27CONFIG_AEABI=y
27# CONFIG_OABI_COMPAT is not set 28# CONFIG_OABI_COMPAT is not set
28CONFIG_LEDS=y 29CONFIG_LEDS=y
30CONFIG_USE_OF=y
29CONFIG_ZBOOT_ROM_TEXT=0x0 31CONFIG_ZBOOT_ROM_TEXT=0x0
30CONFIG_ZBOOT_ROM_BSS=0x0 32CONFIG_ZBOOT_ROM_BSS=0x0
31CONFIG_CPU_FREQ=y 33CONFIG_CPU_FREQ=y
@@ -75,6 +77,7 @@ CONFIG_SERIO_LIBPS2=y
75CONFIG_SERIAL_8250=y 77CONFIG_SERIAL_8250=y
76CONFIG_SERIAL_8250_CONSOLE=y 78CONFIG_SERIAL_8250_CONSOLE=y
77CONFIG_SERIAL_8250_NR_UARTS=3 79CONFIG_SERIAL_8250_NR_UARTS=3
80CONFIG_SERIAL_OF_PLATFORM=y
78CONFIG_I2C=y 81CONFIG_I2C=y
79CONFIG_I2C_CHARDEV=y 82CONFIG_I2C_CHARDEV=y
80CONFIG_I2C_DAVINCI=y 83CONFIG_I2C_DAVINCI=y