diff options
| -rw-r--r-- | core/Makefile | 14 | ||||
| -rw-r--r-- | target/board/Android.mk | 6 |
2 files changed, 12 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index 1b086ca..4a53044 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1190,12 +1190,14 @@ endif ifdef INSTALLED_KERNEL_TARGET $(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/BOOT/kernel endif -ifdef INSTALLED_RAMDISK_TARGET - $(hide) $(ACP) $(INSTALLED_RAMDISK_TARGET) $(zip_root)/BOOT/ramdisk.img -endif -ifdef INSTALLED_BOOTLOADER_MODULE - $(hide) $(ACP) \ - $(INSTALLED_BOOTLOADER_MODULE) $(zip_root)/BOOT/bootloader +ifneq ($(strip $(BOARD_HAS_LOCKED_BOOTLOADER)), true) + ifdef INSTALLED_RAMDISK_TARGET + $(hide) $(ACP) $(INSTALLED_RAMDISK_TARGET) $(zip_root)/BOOT/ramdisk.img + endif + ifdef INSTALLED_BOOTLOADER_MODULE + $(hide) $(ACP) \ + $(INSTALLED_BOOTLOADER_MODULE) $(zip_root)/BOOT/bootloader + endif endif ifdef INSTALLED_2NDBOOTLOADER_TARGET $(hide) $(ACP) \ diff --git a/target/board/Android.mk b/target/board/Android.mk index 7d94ee0..444b5c7 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -10,8 +10,10 @@ ifneq ($(strip $(TARGET_NO_BOOTLOADER)),true) INSTALLED_2NDBOOTLOADER_TARGET := endif else - INSTALLED_BOOTLOADER_MODULE := - INSTALLED_2NDBOOTLOADER_TARGET := + ifneq ($(strip $(BOARD_HAS_LOCKED_BOOTLOADER)), true) + INSTALLED_BOOTLOADER_MODULE := + INSTALLED_2NDBOOTLOADER_TARGET := + endif endif # TARGET_NO_BOOTLOADER ifneq ($(strip $(TARGET_NO_KERNEL)),true) |