From 27953f9927f923aed76b5a5033fd08c77d2fe8ed Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Thu, 9 May 2024 13:00:18 -0400 Subject: [PATCH] odroidc4: Guard cosnole U-boot with different flag Change-Id: Id560e20933ea4458a377eeb785822bb0e1c3bfdc --- factory.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/factory.mk b/factory.mk index 897c699..4a50536 100644 --- a/factory.mk +++ b/factory.mk @@ -56,7 +56,7 @@ $(INSTALLED_AML_INSTALL_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(INSTALL_I $(hide) mkdir -p $(PRODUCT_INSTALL_OUT) ifneq ("$(wildcard $(FACTORY_PATH)/u-boot.bin)","") $(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/u-boot.bin) -else ifeq ($(WITH_CONSOLE),true) +else ifeq ($(WITH_CONSOLE_BL),true) $(hide) $(call aml-copy-install-file, vendor/amlogic/odroidc4/radio/bootloader-console.img, u-boot.bin) else ifneq ("$(wildcard vendor/amlogic/odroidc4/radio/bootloader.img)","") $(hide) $(call aml-copy-install-file, vendor/amlogic/odroidc4/radio/bootloader.img, u-boot.bin) @@ -85,7 +85,7 @@ $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(UPGRADE_I $(hide) mkdir -p $(PRODUCT_UPGRADE_OUT) ifneq ("$(wildcard $(FACTORY_PATH)/u-boot.bin)","") $(hide) $(call aml-copy-upgrade-file, $(FACTORY_PATH)/u-boot.bin) -else ifeq ($(WITH_CONSOLE),true) +else ifeq ($(WITH_CONSOLE_BL),true) $(hide) $(call aml-copy-install-file, vendor/amlogic/odroidc4/radio/bootloader-console.img, u-boot.bin) else ifneq ("$(wildcard vendor/amlogic/odroidc4/radio/bootloader.img)","") $(hide) $(call aml-copy-upgrade-file, vendor/amlogic/odroidc4/radio/bootloader.img, u-boot.bin) -- 2.20.1