| author | Dmitry Shmidt <dimitrysh@google.com> | 2018-12-11 21:34:54 (GMT) |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2018-12-11 21:35:59 (GMT) |
| commit | dc61ee79e6c672d1b8e28afba8c2bea37f2d9a58 (patch) | |
| tree | 0692993f49d317d38adfe5aa8460cf350082d65f | |
| parent | 48a54941c6bf937136f46e42e84a63aef5b9a540 (diff) | |
| download | common-dc61ee79e6c672d1b8e28afba8c2bea37f2d9a58.zip common-dc61ee79e6c672d1b8e28afba8c2bea37f2d9a58.tar.gz common-dc61ee79e6c672d1b8e28afba8c2bea37f2d9a58.tar.bz2 | |
amlogic: Fix aml_upgrade image generation
Bug: 120853826
Test: make -j24
Change-Id: I9891e802a9a6f3276246c0bc0f0d2e4f93eca36e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | factory.mk | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -168,7 +168,8 @@ UPGRADE_FILES := \ aml_sdc_burn.ini \ ddr_init.bin \ u-boot.bin.sd.bin u-boot.bin.usb.bl2 u-boot.bin.usb.tpl \ - u-boot-comp.bin + u-boot.bin.encrypt.sd.bin u-boot.bin.encrypt.usb.bl2 \ + u-boot.bin.encrypt.usb.tpl u-boot-comp.bin ifneq ($(TARGET_USE_SECURITY_MODE),true) UPGRADE_FILES += \ @@ -179,11 +180,7 @@ UPGRADE_FILES += \ platform_enc.conf endif -ifneq ($(TARGET_BUILD_VARIANT),user) - UPGRADE_FILES_DIR := $(TARGET_DEVICE_DIR)/upgrade/ -else - UPGRADE_FILES_DIR := $(TARGET_DEVICE_DIR)/upgrade/signed/ -endif +UPGRADE_FILES_DIR := $(TARGET_DEVICE_DIR)/upgrade/ UPGRADE_FILES := $(addprefix $(UPGRADE_FILES_DIR),$(UPGRADE_FILES)) UPGRADE_FILES := $(wildcard $(UPGRADE_FILES)) #extract only existing files for burnning |