android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: build: Don't enable androidboot.console for consolidate

Browse Source 
Don't enable "androidboot.console=1" for consolidate. Enabling this
results in not being able to interact with serial console except through
`adb`.

Also, generate extra_cmdline only if any board kernel commandline
options are specified, not unconditionally.

Fixes: 585aa20d96 ("ANDROID: build: Pass variant-specific kernel cmdline params to vendor")
Change-Id: I3641ab01d5ddb0f5b582f7ca40257ce06037503a
Signed-off-by: Guru Das Srinagesh <quic_gurus@quicinc.com>
This commit is contained in:
Guru Das Srinagesh 2023-06-09 14:06:08 -07:00
parent d01c6ffda3
commit a60073eecc
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
msm_kernel_la.bzl
View File

@ -111,13 +111,15 @@ EOF
], ],
) )
native.genrule( board_extras = " ".join(boot_image_opts.board_kernel_cmdline_extras)
name = "{}_extra_cmdline".format(target), if board_extras:
outs = ["board_extra_cmdline_{}".format(target)], native.genrule(
cmd_bash = """ name = "{}_extra_cmdline".format(target),
echo {} > "$@" outs = ["board_extra_cmdline_{}".format(target)],
""".format(" ".join(boot_image_opts.board_kernel_cmdline_extras)), cmd_bash = """
) echo {} > "$@"
""".format(board_extras),
)
def _define_kernel_build( def _define_kernel_build(
target, target,
@ -294,7 +296,13 @@ def _define_image_build(
], ],
) )
def _define_kernel_dist(target, msm_target, variant, base_kernel, define_abi_targets): def _define_kernel_dist(
target,
msm_target,
variant,
base_kernel,
define_abi_targets,
boot_image_opts = boot_image_opts()):
"""Creates distribution targets for kernel builds """Creates distribution targets for kernel builds
When Bazel builds everything, the outputs end up buried in `bazel-bin`. When Bazel builds everything, the outputs end up buried in `bazel-bin`.
@ -329,7 +337,9 @@ def _define_kernel_dist(target, msm_target, variant, base_kernel, define_abi_tar
msm_dist_targets.append("{}_avb_sign_boot_image".format(target)) msm_dist_targets.append("{}_avb_sign_boot_image".format(target))
msm_dist_targets.append("{}_extra_cmdline".format(target)) board_extras = " ".join(boot_image_opts.board_kernel_cmdline_extras)
if board_extras:
msm_dist_targets.append("{}_extra_cmdline".format(target))
if define_abi_targets: if define_abi_targets:
kernel_abi_dist( kernel_abi_dist(
@ -471,7 +481,14 @@ def define_msm_la(
in_tree_module_list = in_tree_module_list, in_tree_module_list = in_tree_module_list,
) )
_define_kernel_dist(target, msm_target, variant, base_kernel, define_abi_targets) _define_kernel_dist(
target,
msm_target,
variant,
base_kernel,
define_abi_targets,
boot_image_opts = boot_image_opts,
)
_define_uapi_library(target) _define_uapi_library(target)

5
pineapple.bzl
View File

@ -277,13 +277,14 @@ def define_pineapple():
"bootconfig", "bootconfig",
] ]
board_kernel_cmdline_extras = []
for variant in la_variants: for variant in la_variants:
if variant == "consolidate": if variant == "consolidate":
mod_list = _pineapple_consolidate_in_tree_modules mod_list = _pineapple_consolidate_in_tree_modules
board_kernel_cmdline_extras = ["androidboot.console=1"]
else: else:
mod_list = _pineapple_in_tree_modules mod_list = _pineapple_in_tree_modules
board_kernel_cmdline_extras = ["nosoftlockup", "androidboot.console=0"] board_kernel_cmdline_extras += ["nosoftlockup", "androidboot.console=0"]
kernel_vendor_cmdline_extras += ["nosoftlockup"] kernel_vendor_cmdline_extras += ["nosoftlockup"]
define_msm_la( define_msm_la(