Commit a1b6b737 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'davinci-for-v3.15/soc-2' of...

Merge tag 'davinci-for-v3.15/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Merge "DaVinci SoC fixes for v3.15" from Sekhar Nori:

Includes a patch to enable appended
DTB support for DT booting on DA850
boards with older bootloaders.

* tag 'davinci-for-v3.15/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: fix DT booting with default defconfig
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c7f094d5 b737f51d
...@@ -40,6 +40,8 @@ CONFIG_LEDS=y ...@@ -40,6 +40,8 @@ CONFIG_LEDS=y
CONFIG_USE_OF=y CONFIG_USE_OF=y
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_AUTO_ZRELADDR=y CONFIG_AUTO_ZRELADDR=y
CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
...@@ -70,6 +72,7 @@ CONFIG_MTD_CFI_AMDSTD=m ...@@ -70,6 +72,7 @@ CONFIG_MTD_CFI_AMDSTD=m
CONFIG_MTD_PHYSMAP=m CONFIG_MTD_PHYSMAP=m
CONFIG_MTD_NAND=m CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_DAVINCI=m CONFIG_MTD_NAND_DAVINCI=m
CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_RAM_COUNT=1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment