commit a74a5a19bf02aa5c32d078d98e96d58d583a2679
author Devin Moore <devinmoore@google.com> Fri Mar 12 22:57:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 12 22:57:58 2021 +0000
tree 1df17ce88bac49076258415c8323d323d502f97c
parent b7ade64e3fbfd96c5b20453b655987d8a8ac8b17
parent d6eab6f827aa9317ed7bb1b00e52c64b6e5a9e25

Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty"

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 245a639..57363fb 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -223,7 +223,10 @@
 .KATI_READONLY := $(_board_strip_readonly_list)
 
 INTERNAL_KERNEL_CMDLINE := $(BOARD_KERNEL_CMDLINE)
-INTERNAL_BOOTCONFIG := $(BOARD_BOOTCONFIG)
+ifneq (,$(BOARD_BOOTCONFIG))
+  INTERNAL_KERNEL_CMDLINE += bootconfig
+  INTERNAL_BOOTCONFIG := $(BOARD_BOOTCONFIG)
+endif
 
 ifneq ($(filter %64,$(TARGET_ARCH)),)
   TARGET_IS_64_BIT := true