peregrine: remove custom mkbootimg
Change-Id: If558923c528eff6fd51a9f9f11cdacb7a8e946e3
This commit is contained in:
parent
0691554ef0
commit
0bade9c37e
|
@ -27,7 +27,6 @@ TARGET_LIBINIT_DEFINES_FILE := $(DEVICE_PATH)/init/init_peregrine.cpp
|
|||
TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
|
||||
|
||||
# Kernel
|
||||
BOARD_CUSTOM_BOOTIMG_MK := $(DEVICE_PATH)/mkbootimg.mk
|
||||
TARGET_KERNEL_CONFIG := peregrine_defconfig
|
||||
|
||||
# Partitions
|
||||
|
|
53
mkbootimg.mk
53
mkbootimg.mk
|
@ -1,53 +0,0 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
## Don't change anything under here. The variables are named MSM8926_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
|
||||
MSM8926_DTS_NAMES := msm8926
|
||||
|
||||
MSM8926_DTS_FILES = $(wildcard $(TOP)/$(TARGET_KERNEL_SOURCE)/arch/arm/boot/dts/msm8926-peregrine*.dts)
|
||||
MSM8926_DTS_FILE = $(lastword $(subst /, ,$(1)))
|
||||
DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call MSM8926_DTS_FILE,$(1))))
|
||||
ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call MSM8926_DTS_FILE,$(1))))
|
||||
KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage
|
||||
DTC = $(KERNEL_OUT)/scripts/dtc/dtc
|
||||
|
||||
define append-msm8926-dtb
|
||||
mkdir -p $(KERNEL_OUT)/arch/arm/boot;\
|
||||
$(foreach MSM8926_DTS_NAME, $(MSM8926_DTS_NAMES), \
|
||||
$(foreach d, $(MSM8926_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-msm8926-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}
|
Loading…
Reference in New Issue