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

Commit baf6282f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support a raw bootconfig file as input to vendor-bootconfig.img" into main

parents 72bdfba8 c3eefb6d

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1676,12 +1676,13 @@ ifdef INTERNAL_KERNEL_CMDLINE 
  INTERNAL_VENDOR_BOOTIMAGE_ARGS += --vendor_cmdline "$(INTERNAL_KERNEL_CMDLINE)"

endif



ifdef INTERNAL_BOOTCONFIG

ifneq (, $(INTERNAL_BOOTCONFIG)$(INTERNAL_BOOTCONFIG_FILE))

  INTERNAL_VENDOR_BOOTCONFIG_TARGET := $(PRODUCT_OUT)/vendor-bootconfig.img

  $(INTERNAL_VENDOR_BOOTCONFIG_TARGET):

	rm -f $@

	$(foreach param,$(INTERNAL_BOOTCONFIG), \

	 printf "%s\n" $(param) >> $@;)

	cat $(INTERNAL_BOOTCONFIG_FILE) >> $@

  INTERNAL_VENDOR_BOOTIMAGE_ARGS += --vendor_bootconfig $(INTERNAL_VENDOR_BOOTCONFIG_TARGET)

endif

core/board_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ _board_strip_readonly_list += BOARD_INSTALLER_CMDLINE 
_board_strip_readonly_list += BOARD_KERNEL_CMDLINE

_board_strip_readonly_list += BOARD_BOOT_HEADER_VERSION

_board_strip_readonly_list += BOARD_BOOTCONFIG

_board_strip_readonly_list += BOARD_BOOTCONFIG_FILE

_board_strip_readonly_list += BOARD_KERNEL_BASE

_board_strip_readonly_list += BOARD_USES_GENERIC_AUDIO

_board_strip_readonly_list += BOARD_USES_RECOVERY_AS_BOOT
@@ -311,9 +312,10 @@ endif 
.KATI_READONLY := $(_board_strip_readonly_list)



INTERNAL_KERNEL_CMDLINE := $(BOARD_KERNEL_CMDLINE)

ifneq (,$(BOARD_BOOTCONFIG))

ifneq (,$(BOARD_BOOTCONFIG)$(BOARD_BOOTCONFIG_FILE))

  INTERNAL_KERNEL_CMDLINE += bootconfig

  INTERNAL_BOOTCONFIG := $(BOARD_BOOTCONFIG)

  INTERNAL_BOOTCONFIG_FILE := $(BOARD_BOOTCONFIG_FILE)

endif



ifneq ($(filter %64,$(TARGET_ARCH)),)