diff options
| author | Ethan Chen <intervigil@gmail.com> | 2014-10-06 15:25:57 -0700 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2014-10-14 18:35:44 +0000 |
| commit | 3a267ced5aeb98c3e9cc9c0310a81bf2811eb4e8 (patch) | |
| tree | 2e113354c9bb01af5ba56b6354638eef398d4abf | |
| parent | 7c96daacba98a1b75807404009e62523d7597e61 (diff) | |
find7: Move mkbootimg to common repo
Change-Id: I0a596ea44191ada7148704cb6c43e3c0ff2edebe
| -rw-r--r-- | BoardConfig.mk | 1 | ||||
| -rw-r--r-- | mkbootimg.mk | 57 |
2 files changed, 0 insertions, 58 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 51f9e91..f98521b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -20,7 +20,6 @@ # Kernel BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3 TARGET_KERNEL_CONFIG := cyanogenmod_find7_defconfig -BOARD_CUSTOM_BOOTIMG_MK := device/oppo/find7/mkbootimg.mk # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/oppo/find7/bluetooth diff --git a/mkbootimg.mk b/mkbootimg.mk deleted file mode 100644 index 8f453de..0000000 --- a/mkbootimg.mk +++ /dev/null @@ -1,57 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -## THIS IS A DEFAULT: YOU SHOULD OVERRIDE IT FROM THE DEVICE-SPECIFIC -## BoardConfig. Check the kernel's arch/arm/boot/dts/ path for possible -## values. -G2_DTS_TARGET ?= msm8974pro-*-x90* - - -## Don't change anything under here. The variables are named G2_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 -G2_DTS_NAMES := msm8974 - -G2_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/$(G2_DTS_TARGET)*.dts) -G2_DTS_FILE = $(lastword $(subst /, ,$(1))) -DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call G2_DTS_FILE,$(1)))) -ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call G2_DTS_FILE,$(1)))) -KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage - -define append-g2-dtb -mkdir -p $(KERNEL_OUT)/arch/arm/boot;\ -$(foreach G2_DTS_NAME, $(G2_DTS_NAMES), \ - $(foreach d, $(G2_DTS_FILES), \ - 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-g2-dtb) - $(call pretty,"Target dt image: $(INSTALLED_DTIMAGE_TARGET)") - $(hide) $(DTBTOOL) -2 -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) - @echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST} - $(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} |
