Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
authorVishal Mahaveer <vishalm@ti.com>
Tue, 15 Sep 2015 00:13:59 +0000 (19:13 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Tue, 15 Sep 2015 00:13:59 +0000 (19:13 -0500)
* p-ti-linux-3.14.y-common:
  ARM: dts: dra7-evm: add pinmux configuration for MMC4
  arm: dts: pad DTB size by 4 KB.

Change-Id: If2eb6bb2bc27e7d6cd566fd4ea9060f3fa36f02e
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
1  2 
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/dra7-evm.dts

index d0d32f0918977a60bbcf36620c45f19bf6dd3821,9b245574acdb974b8606105e300b293c775744c8..6abd129b32cd722ecb6b5fa266f07b4d53202de1
@@@ -345,17 -345,13 +345,20 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.d
        zynq-zc706.dtb \
        zynq-zed.dtb
  
 +DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))
 +ifneq ($(DTB_NAMES),)
 +DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
 +else
 +DTB_LIST := $(dtb-y)
 +endif
 +
  targets += dtbs
 -targets += $(dtb-y)
 +targets += $(DTB_LIST)
  endif
  
+ # Pad DTB by 4KB to allow fdt manipulation in MLO
+ DTC_FLAGS ?= -p 4096
  # *.dtb used to be generated in the directory above. Clean out the
  # old build results so people don't accidentally use them.
  dtbs: $(addprefix $(obj)/, $(dtb-y))
Simple merge