p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Caoruihong 2021-08-03 10:46:30 +08:00
parent c66681a1f9
commit 4875707b37
3 changed files with 4 additions and 4 deletions

2
BUILD.gn
View File

@ -63,7 +63,7 @@ if (ohos_build_compiler == "clang") {
liteos_config_file = rebase_path("tools/build/config/$config_file") liteos_config_file = rebase_path("tools/build/config/$config_file")
# we prefer use product specified 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")) { if (exec_script("//build/lite/run_shell_cmd.py", [ "if [ -f $f ]; then echo true; else echo false; fi" ], "value")) {
liteos_config_file = f liteos_config_file = f
} }

4
Makefile
View File

@ -61,9 +61,9 @@ ifeq ($(TEE:1=y),y)
tee = _tee tee = _tee
endif endif
ifeq ($(RELEASE:1=y),y) ifeq ($(RELEASE:1=y),y)
CONFIG ?= $(PRODUCT_PATH)/config/release$(tee).config CONFIG ?= $(PRODUCT_PATH)/kernel_configs/release$(tee).config
else else
CONFIG ?= $(PRODUCT_PATH)/config/debug$(tee).config CONFIG ?= $(PRODUCT_PATH)/kernel_configs/debug$(tee).config
endif endif
$(shell env CONFIG_=$(CONFIG_) DEVICE_PATH=$(DEVICE_PATH) olddefconfig >/dev/null) $(shell env CONFIG_=$(CONFIG_) DEVICE_PATH=$(DEVICE_PATH) olddefconfig >/dev/null)

2
build.sh
View File

@ -53,7 +53,7 @@ function main() {
tee="_tee" tee="_tee"
fi 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 if [ -f "${config_file}" ]; then
cp "${config_file}" "${destination}" cp "${config_file}" "${destination}"
return return