| author | Jacky Liu <qsliu@google.com> | 2020-06-05 08:18:42 (GMT) |
|---|---|---|
| committer | Jacky Liu <qsliu@google.com> | 2020-06-05 08:18:42 (GMT) |
| commit | e9be7ef541fa0d6ca0789f715309b71d46aefa5c (patch) | |
| tree | c306c7b5569292b24f0585614ea23c85fc09f170 | |
| parent | 24e05d893975beb2a947f0e17e75e9e1ab00bb9b (diff) | |
| download | common-e9be7ef541fa0d6ca0789f715309b71d46aefa5c.zip common-e9be7ef541fa0d6ca0789f715309b71d46aefa5c.tar.gz common-e9be7ef541fa0d6ca0789f715309b71d46aefa5c.tar.bz2 | |
Support bootloader variant
Bug: 158196529
Test: build sabrina-user
Change-Id: I7b6f0920ddb4e82110c1aae60cc6481d654e4eef
| -rwxr-xr-x | factory.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -325,6 +325,7 @@ aml_bootloader : $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET) .PHONY: build_always build_always: +ifeq ($(BOOTLOADER_INPUT),) BOOTLOADER_INPUT := $(TARGET_DEVICE_DIR)/bootloader.img #BOOTLOADER_INPUT_SIGNED := $(TARGET_DEVICE_DIR)/prebuilt/bootloader/bl33.bin ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) @@ -337,6 +338,7 @@ ifneq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) BOOTLOADER_INPUT := $(TARGET_DEVICE_DIR)/bootloader_unsign.img endif endif +endif # ifeq ($(BOOTLOADER_INPUT),) ANDROID_HOME_DIR = $(shell pwd) ifneq ($(wildcard bootloader/uboot-repo/*),) @@ -392,8 +394,8 @@ else $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET): $(BOOTLOADER_INPUT) endif mkdir -p $(PRODUCT_OUT)/upgrade/ - cp $(TARGET_DEVICE_DIR)/bootloader.img $(PRODUCT_OUT)/bootloader.img - cp $(TARGET_DEVICE_DIR)/bootloader.img $(PRODUCT_OUT)/upgrade/bootloader.img.encrypt + cp $(BOOTLOADER_INPUT) $(PRODUCT_OUT)/bootloader.img + cp $(BOOTLOADER_INPUT) $(PRODUCT_OUT)/upgrade/bootloader.img.encrypt cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.usb.bl2.signed $(PRODUCT_OUT)/upgrade/ cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.usb.tpl.signed $(PRODUCT_OUT)/upgrade/ cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.sd.signed $(PRODUCT_OUT)/upgrade/ |