Move androidboot parameters to bootconfig for Cuttlefish
Now that boot config is supported, the androidboot parameters that were
being passed to the kernel commandline are now being passed to boot
config with BOARD_BOOTCONFIG.
"bootconfig" kernel parameter is required for the kernel to process the
bootconfig.
Test: Boot cuttlefish device with bootloader and first_stage_init
changes to handle boot config.
Bug: 173815685
Change-Id: Id1b3841081ef750644159b8803fe412c25dfdfeb
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index e9bccf0..70f2301 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -195,7 +195,7 @@
BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/etc/
BOARD_KERNEL_CMDLINE += init=/init
-BOARD_KERNEL_CMDLINE += androidboot.hardware=cutf_cvm
+BOARD_BOOTCONFIG += androidboot.hardware=cutf_cvm
# TODO(b/176860479): Remove once goldfish and cuttlefish share a wifi implementation
BOARD_KERNEL_CMDLINE += mac80211_hwsim.radios=0
@@ -213,13 +213,14 @@
vmw_vsock_virtio_transport_common.virtio_transport_max_vsock_pkt_buf_size=16384
ifeq ($(TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE),f2fs)
-BOARD_KERNEL_CMDLINE += androidboot.fstab_suffix=f2fs
+BOARD_BOOTCONFIG += androidboot.fstab_suffix=f2fs
endif
ifeq ($(TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE),ext4)
-BOARD_KERNEL_CMDLINE += androidboot.fstab_suffix=ext4
+BOARD_BOOTCONFIG += androidboot.fstab_suffix=ext4
endif
+BOARD_KERNEL_CMDLINE += bootconfig
BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_BOOT_HEADER_VERSION := 4
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
