odroidc4: Allow console bootloader in upgrade images

Change-Id: Ifbd89c96cf03e0c83fd464c0cf86df432d5b1ba1

diff --git a/factory.mk b/factory.mk
index 856762ba90cae1c3a123b9187c95a2892499f7b3..897c6995ff798fcf03c68a544a25149414d62ae8 100644 (file)
--- 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