Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42ba9478 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

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 am: 2dfd4aba

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20bc5cfda4f0bbbd81a6766b1165643f8a592af4
parents a9c26688 2dfd4aba

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