tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: reduce content in build.config.db845c.

Browse Source 
All configs except DTC_FLAGS is moved to BUILD.bazel.

As a side effect of setting kernel_build(defconfig), Kleaf enforces that
the final .config has all values required by db845c_gki.fragment. If
that causes build errors like the following in the future, we should
either fix db845c_gki.fragment, or set
kernel_build(check_defconfig = "disabled").

    ERROR: CONFIG_USB_ROLE_SWITCH: actual 'y', expected 'm' from common/arch/arm64/configs/db845c_gki.fragment

Bug: 236012223
Change-Id: Id5b3f264e690176ac59846d32e0d6c62600a8190
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
HONG Yifan
2024-11-01 11:24:07 -07:00
committed by Treehugger Robot
parent 6f8a578813
commit 8faefbf00d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.bazel
+6
View File
@@ -795,9 +795,11 @@ kernel_build(
"arch/arm64/boot/dts/qcom/sm8650-hdk.dtb",
"arch/arm64/boot/dts/qcom/sm8650-qrd.dtb",
],
arch = "arm64",
# Enable mixed build.
base_kernel = ":kernel_aarch64",
build_config = "build.config.db845c",
defconfig = "arch/arm64/configs/gki_defconfig",
make_goals = [
"modules",
"qcom/qrb5165-rb5.dtb",
@@ -811,6 +813,7 @@ kernel_build(
],
makefile = ":Makefile",
module_outs = _DB845C_MODULE_OUTS + _DB845C_WATCHDOG_MODULE_OUTS,
pre_defconfig_fragments = ["arch/arm64/configs/db845c_gki.fragment"],
strip_modules = True,
)
@@ -827,9 +830,11 @@ kernel_build(
"arch/arm64/boot/dts/qcom/sm8650-hdk.dtb",
"arch/arm64/boot/dts/qcom/sm8650-qrd.dtb",
],
arch = "arm64",
# Enable mixed build.
base_kernel = ":kernel_aarch64",
build_config = "build.config.db845c",
defconfig = "arch/arm64/configs/gki_defconfig",
make_goals = [
"modules",
"qcom/qrb5165-rb5.dtb",
@@ -843,6 +848,7 @@ kernel_build(
],
makefile = ":Makefile",
module_outs = _DB845C_MODULE_OUTS,
pre_defconfig_fragments = ["arch/arm64/configs/db845c_gki.fragment"],
strip_modules = True,
)
build.config.db845c
-7
View File
@@ -1,10 +1,3 @@
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
BUILD_INITRAMFS=1
DEFCONFIG=db845c_gki_defconfig
FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
DTC_FLAGS="${DTC_FLAGS} -@"