From 372ee5eeddaf328c78441036a9ceb3ca2ad0c5e3 Mon Sep 17 00:00:00 2001 From: lockzhiner_wang-xiaobin Date: Sat, 6 Aug 2022 02:21:10 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B9=B6=E5=85=A5=E4=B8=BB=E5=B9=B2?= =?UTF-8?q?=E9=81=93=E8=80=8C=E5=81=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lockzhiner_wang-xiaobin --- lingpi/liteos_m/config.gni | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lingpi/liteos_m/config.gni b/lingpi/liteos_m/config.gni index 8683d63..7effcc7 100755 --- a/lingpi/liteos_m/config.gni +++ b/lingpi/liteos_m/config.gni @@ -67,30 +67,20 @@ board_ld_flags_xts = [ board_ld_flags_lockzhiner = [ "-Llibs", "-lblackbox", - "-ldump_static", - "-lhal_file_static", "-lhal_sysparam", - "-lhal_token_static", "-lhal_wifiaware", - "-lhichainsdk", "-lhidumper_mini", "-lhievent_lite", "-lhilog_lite", "-lhilog_static", "-lhiview_lite", - "-lhuks_3.0_sdk", - "-lkernel", "-lmbedtls", "-lmusl-c", "-lmusl-m", - "-lnative_file", "-lsamgr", "-lsamgr_adapter", "-lsamgr_source", - "-lsec_static", "-lsysparam", - "-ltoken_static", - "-lutils_kv_store", "-lwifiaware", "-lwifiservice", # 特殊处理的静态库 @@ -98,8 +88,9 @@ board_ld_flags_lockzhiner = [ "-Wl,--whole-archive", "-lbootstrap", "-lbroadcast", - "-lhal_iothardware", "-lhardware", + "-lkernel", + "-lhal_iothardware", "-lcjson_static", "-Wl,--no-whole-archive", "-Wl,--end-group", -- Gitee From 75ea3f32dd52cb72cd4f34d44526beb2ef2d7d65 Mon Sep 17 00:00:00 2001 From: lockzhiner_wang-xiaobin Date: Thu, 25 Aug 2022 14:09:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lockzhiner_wang-xiaobin --- BUILD.gn | 14 ++++++-------- lingpi/BUILD.gn | 4 ++-- lingpi/liteos_m/BUILD.gn | 2 +- lingpi/third_party/BUILD.gn | 4 +--- lingpi/third_party/rk2206_lwip/BUILD.gn | 9 +++++---- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 02a6126..f233384 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -12,11 +12,9 @@ # limitations under the License. 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 = [ - "lingpi", - ] - } -} \ No newline at end of file + import("//kernel/liteos_m/liteos.gni") + module_name = get_path_info(rebase_path("."), "name") + module_group(module_name) { + modules = [ "lingpi" ] + } +} diff --git a/lingpi/BUILD.gn b/lingpi/BUILD.gn index 7fb8476..8439c8c 100755 --- a/lingpi/BUILD.gn +++ b/lingpi/BUILD.gn @@ -15,10 +15,10 @@ 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 = [ "liteos_m", "third_party", "//vendor/lockzhiner/lingpi/samples", ] } -} \ No newline at end of file +} diff --git a/lingpi/liteos_m/BUILD.gn b/lingpi/liteos_m/BUILD.gn index 23e669d..88493de 100755 --- a/lingpi/liteos_m/BUILD.gn +++ b/lingpi/liteos_m/BUILD.gn @@ -15,4 +15,4 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") kernel_module(module_name) { -} \ No newline at end of file +} diff --git a/lingpi/third_party/BUILD.gn b/lingpi/third_party/BUILD.gn index 29fa8ae..f56789b 100755 --- a/lingpi/third_party/BUILD.gn +++ b/lingpi/third_party/BUILD.gn @@ -14,7 +14,5 @@ import("//kernel/liteos_m/liteos.gni") module_name = get_path_info(rebase_path("."), "name") module_group(module_name) { - modules = [ - "rk2206_lwip", - ] + modules = [ "rk2206_lwip" ] } diff --git a/lingpi/third_party/rk2206_lwip/BUILD.gn b/lingpi/third_party/rk2206_lwip/BUILD.gn index 139e233..f961c3e 100755 --- a/lingpi/third_party/rk2206_lwip/BUILD.gn +++ b/lingpi/third_party/rk2206_lwip/BUILD.gn @@ -15,11 +15,12 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/lite_subsystem.gni") config("public") { - include_dirs = [ "." ] + include_dirs = [ "." ] } build_ext_component("rk2206_lwip") { - exec_path = rebase_path(".", root_build_dir) - outdir = rebase_path("//kernel/liteos_m/components/net/lwip-2.1/porting/include/lwip/") - command = "sh ./build.sh $outdir" + exec_path = rebase_path(".", root_build_dir) + outdir = rebase_path( + "//kernel/liteos_m/components/net/lwip-2.1/porting/include/lwip/") + command = "sh ./build.sh $outdir" } -- Gitee From 9ae705bf438703eb0bd2e32bafbbc02d5343be11 Mon Sep 17 00:00:00 2001 From: lockzhiner_wang-xiaobin Date: Thu, 25 Aug 2022 14:18:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96config.gni?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lockzhiner_wang-xiaobin --- lingpi/liteos_m/config.gni | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lingpi/liteos_m/config.gni b/lingpi/liteos_m/config.gni index 7effcc7..6e06628 100755 --- a/lingpi/liteos_m/config.gni +++ b/lingpi/liteos_m/config.gni @@ -39,10 +39,11 @@ board_toolchain_prefix = "arm-none-eabi-" # Compiler type, "gcc" or "clang". board_toolchain_type = "gcc" -# xts ldflags +# xts ldflags board_ld_flags_xts = [ "-Wl,--start-group", "-Wl,--whole-archive", + # xts测试套件 "-lhal_update_static", "-lhctest", @@ -83,6 +84,7 @@ board_ld_flags_lockzhiner = [ "-lsysparam", "-lwifiaware", "-lwifiservice", + # 特殊处理的静态库 "-Wl,--start-group", "-Wl,--whole-archive", @@ -131,11 +133,11 @@ board_ld_flags = [ "-Wl,-Tbin/board.ld", "-nostdlib", "--specs=nosys.specs", - "-Wl,--wrap=printf", - "-Wl,--wrap=sprintf", - "-Wl,--wrap=snprintf", - "-Wl,--wrap=vsnprintf", - "-Wl,--wrap=vprintf", + "-Wl,--wrap=printf", + "-Wl,--wrap=sprintf", + "-Wl,--wrap=snprintf", + "-Wl,--wrap=vsnprintf", + "-Wl,--wrap=vprintf", "-Wl,--gc-sections", "-Wl,--start-group", "-Wl,--whole-archive", @@ -146,8 +148,8 @@ board_ld_flags = [ "-Wl,--gc-sections", ] board_ld_flags += board_ld_flags_lockzhiner -#board_ld_flags += board_ld_flags_xts +#board_ld_flags += board_ld_flags_xts # Board related headfiles search path. board_include_dirs = [ -- Gitee