commit d724a01f5a19590f45e147c80ae9bac87eecf46f
author Devin Moore <devinmoore@google.com> Fri Mar 12 23:43:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 23:43:05 2021 +0000
tree 1d0700d7df8c3ae38fd32bfe7bc78a1959014520
parent 5b739d4f9b4674dbd799fa7e7f05563c648160b0
parent cc2abae62e82ba4abb2e06e16b1f61534b9342f5

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id99cb87c703d32edb0df7b350e304171e0f75dd2

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