From cdc45b1965e8d4ee2fdd6d374ba415abf07d9766 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Jun 2024 14:08:37 +0200 Subject: arm: vendor for cubox-i DTBs --- target/arm/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'target') diff --git a/target/arm/Makefile b/target/arm/Makefile index 1e2cc478b..d6dab6af0 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -175,7 +175,7 @@ ifeq ($(ADK_TARGET_FS),squashfs) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) VENDOR:=arm/ endif @@ -191,6 +191,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) VENDOR:=st/ endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) +VENDOR:=nxp/imx/ +endif endif dtb-install: @@ -240,8 +243,8 @@ ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) ${KERNEL_MAKE} sun8i-h2-plus-bananapi-m2-zero.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - ${KERNEL_MAKE} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \ - imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)imx6q-cubox-i.dtb $(VENDOR)imx6dl-cubox-i.dtb \ + $(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE) -- cgit v1.2.3