diff options
author | Ethan Chen <intervigil@gmail.com> | 2014-10-06 16:36:07 -0700 |
---|---|---|
committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2014-10-21 09:21:29 +0530 |
commit | 03dc0b43e65fce2966b70fd9b44d72a6c93abef5 (patch) | |
tree | f6f5139a798f2dfe06dcc636eef2b03049840828 /custombootimg.mk | |
parent | 0334399d98433bbb43bc4a896b039a05614bc28f (diff) |
Clean up boot image generation
* Remove duplicate DTB generation step.
* Don't do unnecessary DTB concatenation step.
Change-Id: Ie2028b15a79b03fbd423107e8fb91e3e45a1998e
Diffstat (limited to 'custombootimg.mk')
-rw-r--r-- | custombootimg.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/custombootimg.mk b/custombootimg.mk index aac527b..086bbe5 100644 --- a/custombootimg.mk +++ b/custombootimg.mk @@ -7,24 +7,6 @@ $(uncompressed_ramdisk): $(INSTALLED_RAMDISK_TARGET) INITSH := device/sony/shinano-common/combinedroot/init.sh BOOTREC_DEVICE := $(PRODUCT_OUT)/recovery/bootrec-device -SOMC_BOARD = $(shell echo $(TARGET_KERNEL_CONFIG) | sed -e "s/cm_//" | sed -e "s/_defconfig//") -KERNEL_CONFIG := $(KERNEL_OUT)/.config -DTS_NAMES ?= msm8974 apq8074 msm8974pro-ab apq8074pro-ab -DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*$(SOMC_BOARD).dts) -DTS_FILE = $(lastword $(subst /, ,$(1))) -DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1)))) -ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1)))) -KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage -DTC = $(KERNEL_OUT)/scripts/dtc/dtc - -define append-dtb -mkdir -p $(KERNEL_OUT)/arch/arm/boot;\ -$(foreach DTS_NAME, $(DTS_NAMES), \ - $(foreach d, $(DTS_FILES), \ - $(DTC) -p 1024 -O dtb -o $(call DTB_FILE,$(d)) $(d); \ - cat $(KERNEL_ZIMG) $(call DTB_FILE,$(d)) > $(call ZIMG_FILE,$(d));)) -endef - DTBTOOL := $(HOST_OUT_EXECUTABLES)/dtbToolCM$(HOST_EXECUTABLE_SUFFIX) INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img |