diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-04-09 15:59:27 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-04-09 16:12:51 +0530 |
| commit | 18d1417cb7e98f2ab4166c3b301489ade4381771 (patch) | |
| tree | 94ecd670e33441bfeaf5e53abd2e3e0f1788f716 | |
| parent | 2a5ab29231a89374fc1b6b7e21e119901a8c6744 (diff) | |
Revert "ARM64: add option to build Image.gz/dtb combo"tracking-linaro-android-llct-llct-20150409.0
This reverts commit 082d89f7f2ae529e2d7b50f6259e4430472cf4ed.
Reverting this fixes following build failure:
----------
./scripts/Makefile.clean:14: arch/arm64/boot/amd/Makefile: No such file or directory
make[2]: *** No rule to make target `arch/arm64/boot/amd/Makefile'. Stop.
make[1]: *** [arch/arm64/boot/amd] Error 2
make: *** [archclean] Error 2
----------
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
| -rw-r--r-- | arch/arm64/Makefile | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/.gitignore | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/Makefile | 13 |
3 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index a0aadb07ca02..33e4d1fc8a39 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -52,12 +52,7 @@ libs-y := arch/arm64/lib/ $(libs-y) libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/ # Default target when executing plain make -ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y) -KBUILD_IMAGE := Image.gz-dtb -else KBUILD_IMAGE := Image.gz -endif - KBUILD_DTBS := dtbs all: $(KBUILD_IMAGE) $(KBUILD_DTBS) @@ -81,9 +76,6 @@ dtbs: prepare scripts dtbs_install: $(Q)$(MAKE) $(dtbinst)=$(boot)/dts -Image.gz-dtb: vmlinux scripts dtbs - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ - PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@ diff --git a/arch/arm64/boot/.gitignore b/arch/arm64/boot/.gitignore index eb3551131b1e..8dab0bb6ae66 100644 --- a/arch/arm64/boot/.gitignore +++ b/arch/arm64/boot/.gitignore @@ -1,3 +1,2 @@ Image Image.gz -Image.gz-dtb diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index df519849fa00..5a0e3ab854a5 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -14,27 +14,14 @@ # Based on the ia64 boot/Makefile. # -include $(srctree)/arch/arm64/boot/dts/Makefile - targets := Image Image.gz -DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_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)) - $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) $(obj)/Image.gz: $(obj)/Image FORCE $(call if_changed,gzip) -$(obj)/Image.gz-dtb: $(obj)/Image.gz $(DTB_OBJS) FORCE - $(call if_changed,cat) - install: $(obj)/Image $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image System.map "$(INSTALL_PATH)" |