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

Commit 8916a2a1 authored by David Anderson's avatar David Anderson
Browse files

Don't pass --setup_as_rootfs_from_kernel when using a super partition. 

When the system partition is a dynamic partition, the device will be
using an initial ramdisk and should not have a root device specified on
the kernel command-line.

Bug: 115939310
Test: device boots when BOARD_SUPER_PARTITION_PARTITION_LIST contains
      super and AVB is enabled.

Change-Id: I5c4b2304bf1ab6a59443c43c354845bf8a3949f0
parent 3ea8ca5a

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2767,8 +2767,10 @@ endif 
# - not-chained: The --include_descriptors_from_image option for make_vbmeta_image

#   will include the kernel cmdline descriptor from system.img into vbmeta.img

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

ifeq ($(filter system, $(BOARD_SUPER_PARTITION_PARTITION_LIST)),)

BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += --setup_as_rootfs_from_kernel

endif

endif



BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --padding_size 4096

BOARD_AVB_MAKE_VBMETA_MAINLINE_IMAGE_ARGS += --padding_size 4096