diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-11-30 16:12:51 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-12-27 18:00:20 +0100 |
| commit | 1e97c58c0dd6e05c01a77b43c1013552428c3e24 (patch) | |
| tree | 88d0fad09e27a7494058a93325bb3b17e23fa602 | |
| parent | 83276693797e69f612746462c756aaea1b48c71c (diff) | |
| download | vendor_lineage-1e97c58c0dd6e05c01a77b43c1013552428c3e24.tar.gz vendor_lineage-1e97c58c0dd6e05c01a77b43c1013552428c3e24.tar.bz2 vendor_lineage-1e97c58c0dd6e05c01a77b43c1013552428c3e24.zip | |
kernel: Remove BOARD_KERNEL_PREBUILT_DT support to simplify the code
We don't want to use prebuilt devicetrees anyway, so that part isn't
really needed.
And in order to simplify the integration into AOSP, it's a good
idea to simplify the code as much as possible.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | build/tasks/dt_image.mk | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/build/tasks/dt_image.mk b/build/tasks/dt_image.mk index 21334174..1841b0ed 100644 --- a/build/tasks/dt_image.mk +++ b/build/tasks/dt_image.mk @@ -5,61 +5,11 @@ ifeq ($(strip $(BOARD_CUSTOM_BOOTIMG_MK)),) ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true) INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img -ifeq ($(strip $(BOARD_KERNEL_PREBUILT_DT)),) - -ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) -DTBTOOL_NAME := dtbToolLineage -else -DTBTOOL_NAME := $(TARGET_CUSTOM_DTBTOOL) -endif - -DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX) - -ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) -# dtbToolLineage will search subdirectories -possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ -else -# Most specific paths must come first in possible_dtb_dirs -possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ -endif - -define build-dtimage-target - $(call pretty,"Target dt image: $@") - $(hide) for dir in $(possible_dtb_dirs); do \ - if [ -d "$$dir" ]; then \ - dtb_dir="$$dir"; \ - break; \ - fi; \ - done; \ - $(DTBTOOL) $(BOARD_DTBTOOL_ARGS) -o $@ -s $(BOARD_KERNEL_PAGESIZE) -p $(KERNEL_OUT)/scripts/dtc/ "$$dtb_dir"; - $(hide) chmod a+r $@ -endef - -ifeq ($(strip $(BOARD_KERNEL_LZ4C_DT)),true) -LZ4_DT_IMAGE := $(PRODUCT_OUT)/dt-lz4.img -endif - -$(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET) - $(build-dtimage-target) -ifeq ($(strip $(BOARD_KERNEL_LZ4C_DT)),true) - prebuilts/tools-lineage/${HOST_OS}-x86/bin/lz4 -9 < $@ > $(LZ4_DT_IMAGE) - $(hide) $(ACP) $(LZ4_DT_IMAGE) $@ -endif - @echo "Made DT image: $@" - -else - -$(INSTALLED_DTIMAGE_TARGET) : $(BOARD_KERNEL_PREBUILT_DT) | $(ACP) - $(transform-prebuilt-to-target) - -endif # BOARD_KERNEL_PREBUILT_DT - ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_DTIMAGE_TARGET) .PHONY: dtimage dtimage: $(INSTALLED_DTIMAGE_TARGET) - endif endif |