aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Stefani <luca.stefani.ge1@gmail.com>2015-10-29 10:02:38 -0700
committerLuca Stefani <luca.stefani.ge1@gmail.com>2015-10-29 10:07:27 -0700
commiteb2e51c97dec081fd6369aeaa5267e25e23247f5 (patch)
tree021ec868235a768ef97508f860d3af2f091a3914
parent5d51b486c985fd6d18d7f60eea658d2cbc64acc6 (diff)
titan: remove custom mkbootimg
Change-Id: I71b2c8b9ce022d80ecce791d1fe4b8a71d719619
-rw-r--r--BoardConfig.mk1
-rw-r--r--mkbootimg.mk53
2 files changed, 0 insertions, 54 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6efb2e0..2fbbd5b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,7 +30,6 @@ TARGET_OTA_ASSERT_DEVICE := titan,titan_umts,titan_udstv,titan_umtsds,titan_reta
TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
# Kernel
-BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk
TARGET_KERNEL_CONFIG := titan_defconfig
# Partitions
diff --git a/mkbootimg.mk b/mkbootimg.mk
deleted file mode 100644
index de21548..0000000
--- a/mkbootimg.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-## Don't change anything under here. The variables are named MSM8226_whatever
-## on purpose, to avoid conflicts with similarly named variables at other
-## parts of the build environment
-
-## Imported from the original makefile...
-KERNEL_CONFIG := $(KERNEL_OUT)/.config
-MSM8226_DTS_NAMES := msm8226
-
-MSM8226_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/msm8226-titan*.dts)
-MSM8226_DTS_FILE = $(lastword $(subst /, ,$(1)))
-DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call MSM8226_DTS_FILE,$(1))))
-ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call MSM8226_DTS_FILE,$(1))))
-KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage
-DTC = $(KERNEL_OUT)/scripts/dtc/dtc
-
-define append-msm8226-dtb
-mkdir -p $(KERNEL_OUT)/arch/arm/boot;\
-$(foreach MSM8226_DTS_NAME, $(MSM8226_DTS_NAMES), \
- $(foreach d, $(MSM8226_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
-
-
-## Build and run dtbtool
-DTBTOOL := $(HOST_OUT_EXECUTABLES)/dtbToolCM$(HOST_EXECUTABLE_SUFFIX)
-INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img
-
-$(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr $(INSTALLED_KERNEL_TARGET)
- @echo -e ${CL_CYN}"Start DT image: $@"${CL_RST}
- $(call append-msm8226-dtb)
- $(call pretty,"Target dt image: $(INSTALLED_DTIMAGE_TARGET)")
- $(hide) $(DTBTOOL) -o $(INSTALLED_DTIMAGE_TARGET) -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ $(KERNEL_OUT)/arch/arm/boot/
- @echo -e ${CL_CYN}"Made DT image: $@"${CL_RST}
-
-
-## Overload bootimg generation: Same as the original, + --dt arg
-$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(INSTALLED_DTIMAGE_TARGET)
- $(call pretty,"Target boot image: $@")
- $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --dt $(INSTALLED_DTIMAGE_TARGET) --output $@
- $(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)
- @echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}
-
-## Overload recoveryimg generation: Same as the original, + --dt arg
-$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_DTIMAGE_TARGET) \
- $(recovery_ramdisk) \
- $(recovery_kernel)
- $(call build-recoveryimage-target, $@)
- $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --dt $(INSTALLED_DTIMAGE_TARGET) --output $@
- $(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)
- @echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}