diff options
author | John Stultz <john.stultz@linaro.org> | 2014-04-22 21:49:05 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2014-04-22 21:49:05 -0700 |
commit | 1d9644323e73f177f34b0afe72dd1a7ea39027a9 (patch) | |
tree | c75b707f19bd96785216db4e2a1124a829e31256 | |
parent | b2af8637e566b1af973ea9ba27a68fbf16716415 (diff) | |
parent | 6d9237a0e310789914597c58b894dc2efa3f2e27 (diff) |
Merge branch 'linaro-fixes/experimental/android-3.14' into linaro-android-3.15-experimentaltracking-linaro-android-3.15-llct-20140508.0tracking-linaro-android-3.15-llct-20140507.0tracking-linaro-android-3.15-llct-20140505.0tracking-linaro-android-3.15-llct-20140430.0tracking-linaro-android-3.15-llct-20140423.0
-rw-r--r-- | arch/arm/Kconfig | 14 | ||||
-rw-r--r-- | arch/arm/Makefile | 5 | ||||
-rw-r--r-- | arch/arm/boot/.gitignore | 1 | ||||
-rw-r--r-- | arch/arm/boot/Makefile | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
5 files changed, 9 insertions, 25 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cb9fac090b78..a7323a1d62c9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1969,16 +1969,16 @@ config BUILD_ARM_APPENDED_DTB_IMAGE bool "Build a concatenated zImage/dtb by default" depends on OF help - Enabling this option will cause a concatenated zImage and list of - DTBs to be built by default (instead of a standalone zImage.) - The image will built in arch/arm/boot/zImage-dtb + Enabling this option will cause a concatenated zImage and DTB to + be built by default (instead of a standalone zImage.) The image + will built in arch/arm/boot/zImage-dtb.<dtb name> -config BUILD_ARM_APPENDED_DTB_IMAGE_NAMES - string "Default dtb names" +config BUILD_ARM_APPENDED_DTB_IMAGE_NAME + string "Default dtb name" depends on BUILD_ARM_APPENDED_DTB_IMAGE help - Space separated list of names of dtbs to append when - building a concatenated zImage-dtb. + name of the dtb to append when building a concatenated + zImage/dtb. # Compressed boot loader in ROM. Yes, we really want to ask about # TEXT and BSS so we preserve their values in the config files. diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 72b76c17b46c..4f252e9a5f58 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -277,7 +277,7 @@ libs-y := arch/arm/lib/ $(libs-y) ifeq ($(CONFIG_XIP_KERNEL),y) KBUILD_IMAGE := xipImage else ifeq ($(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE),y) -KBUILD_IMAGE := zImage-dtb +KBUILD_IMAGE := zImage-dtb.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME) else KBUILD_IMAGE := zImage endif @@ -315,9 +315,6 @@ PHONY += dtbs dtbs_install dtbs dtbs_install: prepare scripts $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@ -zImage-dtb: vmlinux scripts dtbs - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ - # We use MRPROPER_FILES and CLEAN_FILES now archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore index ad7a0253ea96..3c79f85975aa 100644 --- a/arch/arm/boot/.gitignore +++ b/arch/arm/boot/.gitignore @@ -4,4 +4,3 @@ xipImage bootpImage uImage *.dtb -zImage-dtb
\ No newline at end of file diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index d09b00ad5fb4..a2e18ef0bdb7 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -28,14 +28,6 @@ export ZRELADDR INITRD_PHYS PARAMS_PHYS targets := Image zImage xipImage bootpImage uImage -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 -DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST)) - ifeq ($(CONFIG_XIP_KERNEL),y) $(obj)/xipImage: vmlinux FORCE @@ -64,10 +56,6 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(call if_changed,objcopy) @$(kecho) ' Kernel: $@ is ready' -$(obj)/zImage-dtb: $(obj)/zImage $(DTB_OBJS) FORCE - $(call if_changed,cat) - @echo ' Kernel: $@ is ready' - endif ifneq ($(LOADADDR),) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 254c62adb52e..35c146f31e46 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -415,7 +415,7 @@ endif # *.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_LIST)) +dtbs: $(addprefix $(obj)/, $(dtb-y)) $(Q)rm -f $(obj)/../*.dtb clean-files := *.dtb |