diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-20 01:30:56 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-20 01:31:12 -0500 |
commit | 1443f8a0b95c07cee9df4420a30eea24123af3f3 (patch) | |
tree | 73a10165643ea9951841c58e3db697550c19fe5e /arch/arm/configs | |
parent | 00b2fa57d50fde1f5d7c3ac0893e49d69c315414 (diff) | |
parent | 001b35fff5d8b0d99a5ae16d8126d501b73cf8aa (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_defconfig | 3 |
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 | |||
17 | CONFIG_ARCH_DAVINCI=y | 17 | CONFIG_ARCH_DAVINCI=y |
18 | CONFIG_ARCH_DAVINCI_DA830=y | 18 | CONFIG_ARCH_DAVINCI_DA830=y |
19 | CONFIG_ARCH_DAVINCI_DA850=y | 19 | CONFIG_ARCH_DAVINCI_DA850=y |
20 | CONFIG_MACH_DA8XX_DT=y | ||
20 | CONFIG_MACH_MITYOMAPL138=y | 21 | CONFIG_MACH_MITYOMAPL138=y |
21 | CONFIG_MACH_OMAPL138_HAWKBOARD=y | 22 | CONFIG_MACH_OMAPL138_HAWKBOARD=y |
22 | CONFIG_DAVINCI_RESET_CLOCKS=y | 23 | CONFIG_DAVINCI_RESET_CLOCKS=y |
@@ -26,6 +27,7 @@ CONFIG_PREEMPT=y | |||
26 | CONFIG_AEABI=y | 27 | CONFIG_AEABI=y |
27 | # CONFIG_OABI_COMPAT is not set | 28 | # CONFIG_OABI_COMPAT is not set |
28 | CONFIG_LEDS=y | 29 | CONFIG_LEDS=y |
30 | CONFIG_USE_OF=y | ||
29 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 31 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
30 | CONFIG_ZBOOT_ROM_BSS=0x0 | 32 | CONFIG_ZBOOT_ROM_BSS=0x0 |
31 | CONFIG_CPU_FREQ=y | 33 | CONFIG_CPU_FREQ=y |
@@ -75,6 +77,7 @@ CONFIG_SERIO_LIBPS2=y | |||
75 | CONFIG_SERIAL_8250=y | 77 | CONFIG_SERIAL_8250=y |
76 | CONFIG_SERIAL_8250_CONSOLE=y | 78 | CONFIG_SERIAL_8250_CONSOLE=y |
77 | CONFIG_SERIAL_8250_NR_UARTS=3 | 79 | CONFIG_SERIAL_8250_NR_UARTS=3 |
80 | CONFIG_SERIAL_OF_PLATFORM=y | ||
78 | CONFIG_I2C=y | 81 | CONFIG_I2C=y |
79 | CONFIG_I2C_CHARDEV=y | 82 | CONFIG_I2C_CHARDEV=y |
80 | CONFIG_I2C_DAVINCI=y | 83 | CONFIG_I2C_DAVINCI=y |