diff options
author | Olof Johansson <olof@lixom.net> | 2015-08-05 11:11:51 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-08-05 11:11:51 +0200 |
commit | 1ff2b94d15ab25cfe7d63a2038fe458269f07f35 (patch) | |
tree | 93aea400ff2538cd2e6aa7c374052b757492e84d /arch/arm/configs | |
parent | e06b2d86215a535d0f652c845c53b6825f58b9d8 (diff) | |
parent | 9e07b491bc004259e42739ecd7483ab5a0b8b150 (diff) |
Merge tag 'mvebu-config-4.3-2' of git://git.infradead.org/linux-mvebu into next/defconfig
mvebu config changes for v4.3 (part #2)
Improve dt support for orion5x
* tag 'mvebu-config-4.3-2' of git://git.infradead.org/linux-mvebu:
ARM: defconfig: orion5x: add DT support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/orion5x_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 855143fac6bd..8099417a9466 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig @@ -14,8 +14,10 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_BSD_DISKLABEL=y CONFIG_ARCH_ORION5X=y +CONFIG_ARCH_ORION5X_DT=y CONFIG_MACH_DB88F5281=y CONFIG_MACH_RD88F5182=y +CONFIG_MACH_RD88F5182_DT=y CONFIG_MACH_KUROBOX_PRO=y CONFIG_MACH_DNS323=y CONFIG_MACH_TS209=y @@ -41,6 +43,7 @@ CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_FPE_NWFPE=y CONFIG_VFP=y CONFIG_NET=y |