From 4875707b37d5e280ce302a2b0a59cf54ee4644b8 Mon Sep 17 00:00:00 2001
From: Caoruihong <crh.cao@huawei.com>
Date: Tue, 3 Aug 2021 10:46:30 +0800
Subject: [PATCH] chore: puts kernel Kconfig configs in kernel_configs dir
for historical reason, the old config dir is used only for hcs_config
Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: I26f25d5ec81b4b4a0e96c30c3acb3f075107e19e
---
BUILD.gn | 2 +-
Makefile | 4 ++--
build.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
index 4a038b26..e3c2d3ce 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -63,7 +63,7 @@ if (ohos_build_compiler == "clang") {
liteos_config_file = rebase_path("tools/build/config/$config_file")
# we prefer use product specified config file
-f = "$product_path/config/${ohos_build_type}${tee}.config"
+f = "$product_path/kernel_configs/${ohos_build_type}${tee}.config"
if (exec_script("//build/lite/run_shell_cmd.py", [ "if [ -f $f ]; then echo true; else echo false; fi" ], "value")) {
liteos_config_file = f
}
diff --git a/Makefile b/Makefile
index c0e14748..7d7d225f 100644
--- a/Makefile
+++ b/Makefile
@@ -61,9 +61,9 @@ ifeq ($(TEE:1=y),y)
tee = _tee
endif
ifeq ($(RELEASE:1=y),y)
-CONFIG ?= $(PRODUCT_PATH)/config/release$(tee).config
+CONFIG ?= $(PRODUCT_PATH)/kernel_configs/release$(tee).config
else
-CONFIG ?= $(PRODUCT_PATH)/config/debug$(tee).config
+CONFIG ?= $(PRODUCT_PATH)/kernel_configs/debug$(tee).config
endif
$(shell env CONFIG_=$(CONFIG_) DEVICE_PATH=$(DEVICE_PATH) olddefconfig >/dev/null)
diff --git a/build.sh b/build.sh
index 16794d13..79c21b74 100755
--- a/build.sh
+++ b/build.sh
@@ -53,7 +53,7 @@ function main() {
tee="_tee"
fi
- config_file="${product_path}/config/${ohos_build_type}${tee}.config"
+ config_file="${product_path}/kernel_configs/${ohos_build_type}${tee}.config"
if [ -f "${config_file}" ]; then
cp "${config_file}" "${destination}"
return