From 14d3af84a803e911f159ecb2f0b686d007e2b1e4 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Wed, 15 Jun 2022 18:59:28 +0800 Subject: [PATCH] feat: normalize drivers framework component and repos Signed-off-by: yuanbo --- dev_wifi_a/liteos_m/config.gni | 306 +++++++++++++++++---------------- hcs/BUILD.gn | 46 ++--- shields/BUILD.gn | 3 +- 3 files changed, 178 insertions(+), 177 deletions(-) diff --git a/dev_wifi_a/liteos_m/config.gni b/dev_wifi_a/liteos_m/config.gni index 7feaf0b..51d788b 100755 --- a/dev_wifi_a/liteos_m/config.gni +++ b/dev_wifi_a/liteos_m/config.gni @@ -1,155 +1,157 @@ -# Copyright (c) 2022 ASR Microelectronics (Shanghai) Co., Ltd. All rights reserved. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# Copyright (c) 2022 ASR Microelectronics (Shanghai) Co., Ltd. All rights reserved. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. - -# Kernel type, e.g. "linux", "liteos_a", "liteos_m". -kernel_type = "liteos_m" - -# Kernel version. -kernel_version = "3.0.0" - -# Board CPU type, e.g. "cortex-a7", "riscv32". -board_cpu = "cortex-m4" - -# Board arch, e.g. "armv7-a", "rv32imac". -board_arch = "" - -# Toolchain name used for system compiling. -# E.g. gcc-arm-none-eabi, arm-linux-harmonyeabi-gcc, ohos-clang, riscv32-unknown-elf. -# Note: The default toolchain is "ohos-clang". It's not mandatory if you use the default toochain. -board_toolchain = "arm-none-eabi" - + +# Kernel type, e.g. "linux", "liteos_a", "liteos_m". +kernel_type = "liteos_m" + +# Kernel version. +kernel_version = "3.0.0" + +# Board CPU type, e.g. "cortex-a7", "riscv32". +board_cpu = "cortex-m4" + +# Board arch, e.g. "armv7-a", "rv32imac". +board_arch = "" + +# Toolchain name used for system compiling. +# E.g. gcc-arm-none-eabi, arm-linux-harmonyeabi-gcc, ohos-clang, riscv32-unknown-elf. +# Note: The default toolchain is "ohos-clang". It's not mandatory if you use the default toochain. +board_toolchain = "arm-none-eabi" + #use_board_toolchain = true - -# The toolchain path instatlled, it's not mandatory if you have added toolchian path to your ~/.bashrc. -# board_toolchain_path = rebase_path("//device/soc/asrmicro/gcc/gcc-arm-none-eabi/Linux64/bin") -board_toolchain_path = "" - -# Compiler prefix. -board_toolchain_prefix = "arm-none-eabi-" - -# Compiler type, "gcc" or "clang". -board_toolchain_type = "gcc" - -# config.json parse -if (product_path != "") { - product_conf = read_file("${product_path}/config.json", "json") - product_name = product_conf.product_name - xts_list = product_conf.xts_list - tests_list = product_conf.tests_list -} - + +# The toolchain path instatlled, it's not mandatory if you have added toolchian path to your ~/.bashrc. +# board_toolchain_path = rebase_path("//device/soc/asrmicro/gcc/gcc-arm-none-eabi/Linux64/bin") +board_toolchain_path = "" + +# Compiler prefix. +board_toolchain_prefix = "arm-none-eabi-" + +# Compiler type, "gcc" or "clang". +board_toolchain_type = "gcc" + +# config.json parse +if (product_path != "") { + product_conf = read_file("${product_path}/config.json", "json") + product_name = product_conf.product_name + xts_list = product_conf.xts_list + tests_list = product_conf.tests_list +} + # Board related common compile flags. - -board_cflags = [ - "-mfloat-abi=softfp", - "-mcpu=cortex-m4", - "-mthumb", - "-mthumb-interwork", - "-mfloat-abi=softfp", - "-mfpu=fpv4-sp-d16", - "-W", - "-std=gnu99", - "-fdata-sections", - "-ffunction-sections", - "-fno-builtin", - "-fno-strict-aliasing", - #"-fno-short-enums", - "-ggdb", - "-Wall", - "-Wfatal-errors", - "-fsigned-char", - "-fno-common", - "-std=gnu11", - #"-std=c99", - "-Wno-unused-label", - "-DDUET_CM4", - "-D__FPU_PRESENT=1", - #"-D__FPU_USED=1", - #"-DLWIP_2_1_2", - #"-DLWIP_DHCP", - #"-D_POSIX_SOURCE", - #"-D_GNU_SOURCE=1", - "-DCFG_NAN_CONFIG", - "-D__LITEOS_M__", - "-Wno-unused-parameter", - "-Wno-sign-compare", - "-Wno-parentheses", - "-Wno-cast-function-type", - ] - -board_cxx_flags = board_cflags - -board_ld_flags = [ - "-mcpu=cortex-m4", - "-mthumb", - "-mthumb-interwork", - "-mfloat-abi=softfp", - "-mfpu=fpv4-sp-d16", - "-W", -] - -# Newlib adapt. -board_ld_flags += [ - "-Wl,--wrap=_free_r", - "-Wl,--wrap=_malloc_usable_size_r", - "-Wl,--wrap=_malloc_r", - "-Wl,--wrap=_memalign_r", - "-Wl,--wrap=_realloc_r", - "-Wl,--wrap=printf", - "-Wl,--wrap=sprintf", - "-Wl,--wrap=snprintf", - "-Wl,--wrap=vprintf", - "-Wl,--wrap=vsprintf", - "-Wl,--wrap=vsnprintf", -] - -# Board related headfiles search path. -board_include_dirs = [ - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/platform/system/include/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/platform/CMSIS/Include/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/platform/misc/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/kv/include/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/driver/inc/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/common/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/include/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/iperf/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/config/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/liteos_m/", - "//kernel/liteos_m/kernel/arch/arm/cortex-m4/gcc/", - "//kernel/liteos_m/kernel/arch/include/", - "//kernel/liteos_m/utils/", - "//kernel/liteos_m/kal/cmsis/", - "//device/soc/asrmicro/asr582x/liteos_m/sdk/rtos", - "//utils/native/lite/kal/timer/", - "//utils/native/lite/include/", - "//third_party/bounds_checking_function/include", - "//kernel/liteos_m/kernel/include/", - "//kernel/liteos_m/kal/posix/include/", - "//kernel/liteos_m/components/exchook/", - "//third_party/openssl", - "//third_party/openssl/include", - "//third_party/openssl/crypto/include", - "//third_party/openssl/crypto/ec", -] -board_include_dirs += [] - -# Board adapter dir for OHOS components. -board_adapter_dir = "" - -# Sysroot path. -board_configed_sysroot = "" - -# Board storage type, it used for file system generation. -storage_type = "" - -#ohos_build_type = "release" + +board_cflags = [ + "-mfloat-abi=softfp", + "-mcpu=cortex-m4", + "-mthumb", + "-mthumb-interwork", + "-mfloat-abi=softfp", + "-mfpu=fpv4-sp-d16", + "-W", + "-std=gnu99", + "-fdata-sections", + "-ffunction-sections", + "-fno-builtin", + "-fno-strict-aliasing", + + #"-fno-short-enums", + "-ggdb", + "-Wall", + "-Wfatal-errors", + "-fsigned-char", + "-fno-common", + "-std=gnu11", + + #"-std=c99", + "-Wno-unused-label", + "-DDUET_CM4", + "-D__FPU_PRESENT=1", + + #"-D__FPU_USED=1", + #"-DLWIP_2_1_2", + #"-DLWIP_DHCP", + #"-D_POSIX_SOURCE", + #"-D_GNU_SOURCE=1", + "-DCFG_NAN_CONFIG", + "-D__LITEOS_M__", + "-Wno-unused-parameter", + "-Wno-sign-compare", + "-Wno-parentheses", + "-Wno-cast-function-type", +] + +board_cxx_flags = board_cflags + +board_ld_flags = [ + "-mcpu=cortex-m4", + "-mthumb", + "-mthumb-interwork", + "-mfloat-abi=softfp", + "-mfpu=fpv4-sp-d16", + "-W", +] + +# Newlib adapt. +board_ld_flags += [ + "-Wl,--wrap=_free_r", + "-Wl,--wrap=_malloc_usable_size_r", + "-Wl,--wrap=_malloc_r", + "-Wl,--wrap=_memalign_r", + "-Wl,--wrap=_realloc_r", + "-Wl,--wrap=printf", + "-Wl,--wrap=sprintf", + "-Wl,--wrap=snprintf", + "-Wl,--wrap=vprintf", + "-Wl,--wrap=vsprintf", + "-Wl,--wrap=vsnprintf", +] + +# Board related headfiles search path. +board_include_dirs = [ + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/platform/system/include/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/platform/CMSIS/Include/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/platform/misc/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/kv/include/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/driver/inc/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/common/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/include/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/drivers/iperf/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/config/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/liteos_m/", + "//kernel/liteos_m/kernel/arch/arm/cortex-m4/gcc/", + "//kernel/liteos_m/kernel/arch/include/", + "//kernel/liteos_m/utils/", + "//kernel/liteos_m/kal/cmsis/", + "//device/soc/asrmicro/asr582x/liteos_m/sdk/rtos", + "//utils/native/lite/kal/timer/", + "//utils/native/lite/include/", + "//third_party/bounds_checking_function/include", + "//kernel/liteos_m/kernel/include/", + "//kernel/liteos_m/kal/posix/include/", + "//kernel/liteos_m/components/exchook/", + "//third_party/openssl", + "//third_party/openssl/include", + "//third_party/openssl/crypto/include", + "//third_party/openssl/crypto/ec", +] +board_include_dirs += [] + +# Board adapter dir for OHOS components. +board_adapter_dir = "" + +# Sysroot path. +board_configed_sysroot = "" + +# Board storage type, it used for file system generation. +storage_type = "" +#ohos_build_type = "release" diff --git a/hcs/BUILD.gn b/hcs/BUILD.gn index 275e9ce..ea3cd78 100755 --- a/hcs/BUILD.gn +++ b/hcs/BUILD.gn @@ -1,24 +1,24 @@ -# Copyright (c) 2022 ASR Microelectronics (Shanghai) Co., Ltd. All rights reserved. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# Copyright (c) 2022 ASR Microelectronics (Shanghai) Co., Ltd. All rights reserved. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. - -if (ohos_kernel_type == "liteos_m") { - import("//drivers/adapter/khdf/liteos_m/hdf.gni") - module_name = get_path_info(rebase_path("."), "name") - hdf_driver(module_name) { - hcs_sources = [ "asr582x.hcs" ] - visibility += [ - "$device_path", - ".", - ] - } -} + +if (ohos_kernel_type == "liteos_m") { + import("//drivers/hdf_core/adapter/khdf/liteos_m/hdf.gni") + module_name = get_path_info(rebase_path("."), "name") + hdf_driver(module_name) { + hcs_sources = [ "asr582x.hcs" ] + visibility += [ + "$device_path", + ".", + ] + } +} diff --git a/shields/BUILD.gn b/shields/BUILD.gn index 2712d25..a09cbc1 100755 --- a/shields/BUILD.gn +++ b/shields/BUILD.gn @@ -15,7 +15,6 @@ if (ohos_kernel_type == "liteos_m") { import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") module_group(module_name) { - modules = [ - ] + modules = [] } }