Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec9c178 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Fix "Fix OTA package generation with multi-image uboot files" 

Derp, the OTA stuff broke the regular boot.img generation due to
variable colision.

Change-Id: I63da1365a12da1a7b0e6360db77b616298cfb636
parent e3859eb0

core/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -1138,15 +1138,15 @@ endif 


ifeq ($(BOARD_USES_UBOOT_MULTIIMAGE),true)



  INTERNAL_URAMDISKIMAGE_ARGS := -A ARM -O Linux -T multi -C none -n Image

  ZIP_SAVE_UBOOTIMG_ARGS := -A ARM -O Linux -T multi -C none -n Image



  BOARD_UBOOT_ENTRY := $(strip $(BOARD_UBOOT_ENTRY))

  ifdef BOARD_UBOOT_ENTRY

    INTERNAL_URAMDISKIMAGE_ARGS += -e $(BOARD_UBOOT_ENTRY)

    ZIP_SAVE_UBOOTIMG_ARGS += -e $(BOARD_UBOOT_ENTRY)

  endif

  BOARD_UBOOT_LOAD := $(strip $(BOARD_UBOOT_LOAD))

  ifdef BOARD_UBOOT_LOAD

    INTERNAL_URAMDISKIMAGE_ARGS += -a $(BOARD_UBOOT_LOAD)

    ZIP_SAVE_UBOOTIMG_ARGS += -a $(BOARD_UBOOT_LOAD)

  endif



endif
@@ -1217,8 +1217,8 @@ endif 
ifdef BOARD_KERNEL_PAGESIZE

	$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize

endif

ifdef INTERNAL_URAMDISKIMAGE_ARGS

	$(hide) echo "$(INTERNAL_URAMDISKIMAGE_ARGS)" > $(zip_root)/BOOT/ubootargs

ifdef ZIP_SAVE_UBOOTIMG_ARGS

	$(hide) echo "$(ZIP_SAVE_UBOOTIMG_ARGS)" > $(zip_root)/BOOT/ubootargs

endif



	$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\