| commit | cc2abae62e82ba4abb2e06e16b1f61534b9342f5 | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Fri Mar 12 23:22:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 23:22:05 2021 +0000 |
| tree | 1df17ce88bac49076258415c8323d323d502f97c | |
| parent | a3cfaead7bad0a1889c7f5839dfcc112d13dd071 [diff] | |
| parent | a74a5a19bf02aa5c32d078d98e96d58d583a2679 [diff] |
Merge "Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty" am: a74a5a19bf Original change: https://android-review.googlesource.com/c/platform/build/+/1627053 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie0ab7ce322cc34d95c88172c27c0a692e378b858
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