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

Commit c7a77480 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Steve Kondik
Browse files

ota: Build uboot bootable images when necessary 

Conflicts:
	core/Makefile
	tools/releasetools/common.py

Change-Id: I18996bb1f5377bbf369fb41774aaa1f5821e7d1f
parent 252f2a24

core/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,21 @@ else 
$(BUILT_TARGET_FILES_PACKAGE): tool_extensions := $(TARGET_RELEASETOOLS_EXTENSIONS)

endif



ifeq ($(BOARD_USES_UBOOT_MULTIIMAGE),true)



  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

    ZIP_SAVE_UBOOTIMG_ARGS += -e $(BOARD_UBOOT_ENTRY)

  endif

  BOARD_UBOOT_LOAD := $(strip $(BOARD_UBOOT_LOAD))

  ifdef BOARD_UBOOT_LOAD

    ZIP_SAVE_UBOOTIMG_ARGS += -a $(BOARD_UBOOT_LOAD)

  endif



endif



# Depending on the various images guarantees that the underlying

# directories are up-to-date.

$(BUILT_TARGET_FILES_PACKAGE): \
@@ -1480,6 +1495,9 @@ endif 


ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)

	$(hide) echo "$(INSTALLED_DTIMAGE_TARGET)" > $(zip_root)/BOOT/dt_args

endif

ifdef ZIP_SAVE_UBOOTIMG_ARGS

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

endif

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

	            mkdir -p $(zip_root)/RADIO; \

tools/releasetools/common.py

+54 −44
Original line number Diff line number Diff line
@@ -308,9 +308,19 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): 
  assert p1.returncode == 0, "mkbootfs of %s ramdisk failed" % (targetname,)

  assert p2.returncode == 0, "minigzip of %s ramdisk failed" % (targetname,)



  """check if uboot is requested"""

  fn = os.path.join(sourcedir, "ubootargs")

  if os.access(fn, os.F_OK):

    cmd = ["mkimage"]

    for argument in open(fn).read().rstrip("\n").split(" "):

      cmd.append(argument)

    cmd.append("-d")

    cmd.append(os.path.join(sourcedir, "kernel")+":"+ramdisk_img.name)

    cmd.append(img.name)



  else:

    # use MKBOOTIMG from environ, or "mkbootimg" if empty or not set

    mkbootimg = os.getenv('MKBOOTIMG') or "mkbootimg"



    cmd = [mkbootimg, "--kernel", os.path.join(sourcedir, "kernel")]



    fn = os.path.join(sourcedir, "second")