Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c04f701 authored by Luca Stefani's avatar Luca Stefani Committed by Gerrit Code Review
Browse files

build: create dt.img task 

* Remove dt.img creation from generate_extra_images

Change-Id: I676b588cd9acb671771acda638abefee036f0519
parent 406c2afa

core/generate_extra_images.mk

+0 −37
Original line number Diff line number Diff line
@@ -80,43 +80,6 @@ $(INSTALLED_PERSISTIMAGE_TARGET): $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(INTERNAL_PERS 
ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PERSISTIMAGE_TARGET)

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_PERSISTIMAGE_TARGET)





#----------------------------------------------------------------------

# Generate device tree image (dt.img)

#----------------------------------------------------------------------

ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)

ifeq ($(strip $(BUILD_TINY_ANDROID)),true)

include device/qcom/common/dtbtool/Android.mk

endif



ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)

DTBTOOL_NAME := dtbToolCM

else

DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL)

endif



DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX)



INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img



possible_dtb_dirs = $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/arm/boot/

dtb_dir = $(firstword $(wildcard $(possible_dtb_dirs)))



define build-dtimage-target

    $(call pretty,"Target dt image: $(INSTALLED_DTIMAGE_TARGET)")

    $(hide) $(DTBTOOL) $(BOARD_DTBTOOL_ARGS) -o $@ -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ $(dtb_dir)

    $(hide) chmod a+r $@

endef



$(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET)

	$(build-dtimage-target)

	@echo -e ${CL_CYN}"Made DT image: $@"${CL_RST}



ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTIMAGE_TARGET)

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_DTIMAGE_TARGET)

endif





#----------------------------------------------------------------------

# Generate 1GB userdata image for 8930

#----------------------------------------------------------------------

core/tasks/dt_image.mk

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#----------------------------------------------------------------------

# Generate device tree image (dt.img)

#----------------------------------------------------------------------

ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)

ifeq ($(strip $(BUILD_TINY_ANDROID)),true)

include device/qcom/common/dtbtool/Android.mk

endif



ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)

DTBTOOL_NAME := dtbToolCM

else

DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL)

endif



DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX)



INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img



possible_dtb_dirs = $(KERNEL_OUT)/arch/$(TARGET_KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/arm/boot/

dtb_dir = $(firstword $(wildcard $(possible_dtb_dirs)))



define build-dtimage-target

    $(call pretty,"Target dt image: $@")

    $(hide) $(DTBTOOL) $(BOARD_DTBTOOL_ARGS) -o $@ -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ $(dtb_dir)

    $(hide) chmod a+r $@

endef



$(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET)

	$(build-dtimage-target)

	@echo -e ${CL_CYN}"Made DT image: $@"${CL_RST}



ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTIMAGE_TARGET)

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_DTIMAGE_TARGET)

endif