From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Wed, 8 May 2024 23:20:31 +0000 (-0400)
Subject: odroidc4: Allow console bootloader in upgrade images
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aed3c58ac695a0c3695d18d60b4a3ff5f043082b;p=GitHub%2FLineageOS%2FG12%2Fandroid_device_hardkernel_odroidc4.git

odroidc4: Allow console bootloader in upgrade images

Change-Id: Ifbd89c96cf03e0c83fd464c0cf86df432d5b1ba1
---

diff --git a/factory.mk b/factory.mk
index 856762b..897c699 100644
--- a/factory.mk
+++ b/factory.mk
@@ -57,7 +57,7 @@ $(INSTALLED_AML_INSTALL_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(INSTALL_I
 ifneq ("$(wildcard $(FACTORY_PATH)/u-boot.bin)","")
 	$(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/u-boot.bin)
 else ifeq ($(WITH_CONSOLE),true)
-        $(hide) $(call aml-copy-install-file, vendor/amlogic/odroidc4/radio/bootloader-console.img, u-boot.bin)
+	$(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)
 else
@@ -85,6 +85,8 @@ $(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)
+	$(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)
 else