LineageOS/android_vendor_lineage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: Move our dtb.img logic here

Browse Source 
Our build/make changes break incremenetal builds with prebuilt dtb dir
(see discussion here: https://android-review.googlesource.com/c/platform/build/+/1134337/1/core/Makefile )

Instead of using the AOSP recipe, just define our own and use it by not defining
BOARD_PREBUILT_DTBIMAGE_DIR

Change-Id: If579b1670db447557b6f76ca79ecec22661c4080
This commit is contained in:
Rashed Abdel-Tawab
2019-10-07 14:42:30 -04:00
parent 2c247d80d0
commit e3c319a271
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/tasks/kernel.mk
View File

@@ -305,10 +305,11 @@ kernel: $(INSTALLED_KERNEL_TARGET)
dtboimage: $(INSTALLED_DTBOIMAGE_TARGET) dtboimage: $(INSTALLED_DTBOIMAGE_TARGET)
ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true) ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
$(BOARD_PREBUILT_DTBIMAGE_DIR): $(INSTALLED_DTBIMAGE_TARGET):
echo -e ${CL_GRN}"Building DTBs"${CL_RST} echo -e ${CL_GRN}"Building DTBs"${CL_RST}
$(call make-dtb-target,$(KERNEL_DEFCONFIG)) $(call make-dtb-target,$(KERNEL_DEFCONFIG))
$(call make-dtb-target,dtbs) $(call make-dtb-target,dtbs)
cat $(shell find $(DTBS_OUT)/arch/$(KERNEL_ARCH)/boot/dts/** -type f -name "*.dtb" | sort) > $@
.PHONY: dtbimage .PHONY: dtbimage
dtbimage: $(INSTALLED_DTBIMAGE_TARGET) dtbimage: $(INSTALLED_DTBIMAGE_TARGET)
endif # BOARD_INCLUDE_DTB_IN_BOOTIMG endif # BOARD_INCLUDE_DTB_IN_BOOTIMG

4
config/BoardConfigKernel.mk
View File

@@ -137,10 +137,6 @@ else ifeq ($(BOARD_KERNEL_SEPARATED_DTBO),true)
BOARD_PREBUILT_DTBOIMAGE ?= $(PRODUCT_OUT)/dtbo-pre.img BOARD_PREBUILT_DTBOIMAGE ?= $(PRODUCT_OUT)/dtbo-pre.img
endif endif
ifeq ($(BOARD_INCLUDE_DTB_IN_BOOTIMG),true)
BOARD_PREBUILT_DTBIMAGE_DIR ?= $(PRODUCT_OUT)/dtbs/arch/$(KERNEL_ARCH)/boot/dts/**
endif
# Set use the full path to the make command # Set use the full path to the make command
KERNEL_MAKE_CMD := $(BUILD_TOP)/prebuilts/build-tools/$(HOST_OS)-x86/bin/make KERNEL_MAKE_CMD := $(BUILD_TOP)/prebuilts/build-tools/$(HOST_OS)-x86/bin/make