Commit 2dfd4aba authored Mar 13, 2021 by Devin Moore Committed by Automerger Merge Worker Mar 13, 2021

Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" am:...

Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" am: a74a5a19 am: cc2abae6 am: d724a01f

Original change: https://android-review.googlesource.com/c/platform/build/+/1627053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fa4fbae2b52d6bdc0f0eea8137afb5e837bbfe4

core/board_config.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,10 @@ endif
		.KATI_READONLY := $(_board_strip_readonly_list)

		INTERNAL_KERNEL_CMDLINE := $(BOARD_KERNEL_CMDLINE)
		ifneq (,$(BOARD_BOOTCONFIG))
		INTERNAL_KERNEL_CMDLINE += bootconfig
		INTERNAL_BOOTCONFIG := $(BOARD_BOOTCONFIG)
		endif

		ifneq ($(filter %64,$(TARGET_ARCH)),)
		TARGET_IS_64_BIT := true