StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id99cb87c703d32edb0df7b350e304171e0f75dd2
This commit is contained in:
Devin Moore
2021-03-12 23:43:05 +00:00
committed by Automerger Merge Worker
parent 5b739d4f9b cc2abae62e
commit d724a01f5a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/board_config.mk
View File

@@ -223,7 +223,10 @@ endif
.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