Revert "kernel: Remove unneeded MKDTIMG dependency"

This reverts commit caa3bddf00.

Reason for revert: Breaks pixel dtbo.img build, since kernel depends on
mkdtimg. Add it back so it gets compiled and kernel can pick it up.

Change-Id: I2b9fd0b2b35e0cf2f908516b10f65399780d5c30
This commit is contained in:
Michael Bestas 2022-06-20 09:04:48 +02:00
parent 35c91c0205
commit 87c0acd05e

View file

@ -438,12 +438,13 @@ ifeq (true,$(filter true, $(TARGET_NEEDS_DTBOIMAGE) $(BOARD_KERNEL_SEPARATED_DTB
ifneq ($(BOARD_CUSTOM_DTBOIMG_MK),) ifneq ($(BOARD_CUSTOM_DTBOIMG_MK),)
include $(BOARD_CUSTOM_DTBOIMG_MK) include $(BOARD_CUSTOM_DTBOIMG_MK)
else else
MKDTIMG := $(HOST_OUT_EXECUTABLES)/mkdtimg$(HOST_EXECUTABLE_SUFFIX)
MKDTBOIMG := $(HOST_OUT_EXECUTABLES)/mkdtboimg.py$(HOST_EXECUTABLE_SUFFIX) MKDTBOIMG := $(HOST_OUT_EXECUTABLES)/mkdtboimg.py$(HOST_EXECUTABLE_SUFFIX)
$(DTBO_OUT): $(DTBO_OUT):
mkdir -p $(DTBO_OUT) mkdir -p $(DTBO_OUT)
$(BOARD_PREBUILT_DTBOIMAGE): $(DTC) $(MKDTBOIMG) $(DTBO_OUT) $(BOARD_PREBUILT_DTBOIMAGE): $(DTC) $(MKDTIMG) $(MKDTBOIMG) $(DTBO_OUT)
$(BOARD_PREBUILT_DTBOIMAGE): $(BOARD_PREBUILT_DTBOIMAGE):
@echo "Building dtbo.img" @echo "Building dtbo.img"
$(hide) find $(DTBO_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtbo" | xargs rm -f $(hide) find $(DTBO_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtbo" | xargs rm -f