ANDROID: Delete build.config.amlogic.
All build configs can be represented in BUILD.bazel.
As a side effect of setting kernel_build(defconfig), Kleaf enforces that
the final .config has all values required by amlogic_gki.fragment. If
that causes build errors like the following in the future, we should
either fix amlogic_gki.fragment, or set
kernel_build(check_defconfig = "disabled").
ERROR: CONFIG_BRCMUTIL: actual '', expected 'm' from common/arch/arm64/configs/amlogic_gki.fragment
Bug: 236012223
Change-Id: I7ef7a27159447e3d9d2609ee7586a67e2c685459
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
+8
-2
@@ -1191,7 +1191,9 @@ kernel_build(
|
||||
"vmlinux",
|
||||
"vmlinux.symvers",
|
||||
],
|
||||
build_config = "build.config.amlogic",
|
||||
arch = "arm64",
|
||||
build_config = "build.config.common",
|
||||
defconfig = "arch/arm64/configs/gki_defconfig",
|
||||
make_goals = [
|
||||
"Image",
|
||||
"modules",
|
||||
@@ -1202,6 +1204,7 @@ kernel_build(
|
||||
],
|
||||
makefile = ":Makefile",
|
||||
module_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64") + _AMLOGIC_MODULE_OUTS + _AMLOGIC_WATCHDOG_MODULE_OUTS,
|
||||
pre_defconfig_fragments = ["arch/arm64/configs/amlogic_gki.fragment"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
@@ -1220,7 +1223,9 @@ kernel_build(
|
||||
"vmlinux",
|
||||
"vmlinux.symvers",
|
||||
],
|
||||
build_config = "build.config.amlogic",
|
||||
arch = "arm64",
|
||||
build_config = "build.config.common",
|
||||
defconfig = "arch/arm64/configs/gki_defconfig",
|
||||
make_goals = [
|
||||
"Image",
|
||||
"modules",
|
||||
@@ -1231,6 +1236,7 @@ kernel_build(
|
||||
],
|
||||
makefile = ":Makefile",
|
||||
module_outs = get_gki_modules_list("arm64") + get_kunit_modules_list("arm64") + _AMLOGIC_MODULE_OUTS,
|
||||
pre_defconfig_fragments = ["arch/arm64/configs/amlogic_gki.fragment"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
|
||||
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64
|
||||
|
||||
DEFCONFIG=amlogic_gki_defconfig
|
||||
FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/amlogic_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}"
|
||||
Reference in New Issue
Block a user