fix: 修复xts编译问题

Signed-off-by: fangye <fangye@talkweb.com.cn>
Change-Id: I75eade665a94ee5fd188fc8944938c3667f0c6bb
This commit is contained in:
fangye
2022-11-03 14:23:04 +08:00
parent 84f1ba2776
commit e154250f78
2 changed files with 58 additions and 58 deletions
+57 -57
View File
@@ -14,56 +14,52 @@
import("//kernel/liteos_m/liteos.gni")
module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) {
sources = [
"src/target_startup.c",
]
deps = [
"//vendor/openvalley/niobeu4/demo:demo",
]
sources = [ "src/target_startup.c" ]
deps = [ "//vendor/openvalley/niobeu4/demo:demo" ]
}
config("public") {
ESP_SDK_PATH="//device/soc/esp/esp32/components/"
ESP_SDK_PATH = "//device/soc/esp/esp32/components/"
include_dirs = [
".",
"include",
ESP_SDK_PATH+"esp_rom/include",
ESP_SDK_PATH+"esp_rom/esp32",
ESP_SDK_PATH+"esp_rom/include/esp32",
ESP_SDK_PATH+"spi_flash/include",
ESP_SDK_PATH+"spiffs/include",
ESP_SDK_PATH+"lwip",
ESP_SDK_PATH+"lwip/lwip/src/include",
ESP_SDK_PATH+"lwip/port/esp32/include",
ESP_SDK_PATH+"esp_common/include",
ESP_SDK_PATH+"driver/include",
ESP_SDK_PATH + "esp_rom/include",
ESP_SDK_PATH + "esp_rom/esp32",
ESP_SDK_PATH + "esp_rom/include/esp32",
ESP_SDK_PATH + "spi_flash/include",
ESP_SDK_PATH + "spiffs/include",
ESP_SDK_PATH + "lwip",
ESP_SDK_PATH + "lwip/lwip/src/include",
ESP_SDK_PATH + "lwip/port/esp32/include",
ESP_SDK_PATH + "esp_common/include",
ESP_SDK_PATH + "driver/include",
ESP_SDK_PATH,
ESP_SDK_PATH+"xtensa/include",
ESP_SDK_PATH+"esp_system/include",
ESP_SDK_PATH+"soc/esp32/include",
ESP_SDK_PATH+"hal/include",
ESP_SDK_PATH+"hal/esp32/include",
ESP_SDK_PATH+"soc/include",
ESP_SDK_PATH+"esp_rom/include",
ESP_SDK_PATH+"freertos/include",
ESP_SDK_PATH+"freertos/port/xtensa/include",
ESP_SDK_PATH+"xtensa/esp32/include",
ESP_SDK_PATH+"esp_timer/include",
ESP_SDK_PATH+"newlib/platform_include",
ESP_SDK_PATH+"esp_hw_support/include",
ESP_SDK_PATH+"heap/include",
ESP_SDK_PATH+"log/include",
ESP_SDK_PATH+"hal/esp32/include",
ESP_SDK_PATH+"hal/include",
ESP_SDK_PATH+"spi_flash/include",
ESP_SDK_PATH+"nvs_flash/include",
ESP_SDK_PATH+"bt/include/esp32/include",
ESP_SDK_PATH+"bt/host/bluedroid/api/include/api",
ESP_SDK_PATH+"log/include",
ESP_SDK_PATH + "xtensa/include",
ESP_SDK_PATH + "esp_system/include",
ESP_SDK_PATH + "soc/esp32/include",
ESP_SDK_PATH + "hal/include",
ESP_SDK_PATH + "hal/esp32/include",
ESP_SDK_PATH + "soc/include",
ESP_SDK_PATH + "esp_rom/include",
ESP_SDK_PATH + "freertos/include",
ESP_SDK_PATH + "freertos/port/xtensa/include",
ESP_SDK_PATH + "xtensa/esp32/include",
ESP_SDK_PATH + "esp_timer/include",
ESP_SDK_PATH + "newlib/platform_include",
ESP_SDK_PATH + "esp_hw_support/include",
ESP_SDK_PATH + "heap/include",
ESP_SDK_PATH + "log/include",
ESP_SDK_PATH + "hal/esp32/include",
ESP_SDK_PATH + "hal/include",
ESP_SDK_PATH + "spi_flash/include",
ESP_SDK_PATH + "nvs_flash/include",
ESP_SDK_PATH + "bt/include/esp32/include",
ESP_SDK_PATH + "bt/host/bluedroid/api/include/api",
ESP_SDK_PATH + "log/include",
]
lib_dirs = [
rebase_path(ESP_SDK_PATH+"libs"),
"$root_out_dir/libs"
lib_dirs = [
rebase_path(ESP_SDK_PATH + "libs"),
"$root_out_dir/libs",
]
ldflags = [
"-nostdlib",
@@ -105,20 +101,24 @@ config("public") {
"-Wl,--wrap=LOS_MemFree",
"-Wl,--wrap=LOS_MemAllocAlign",
"-Wl,--wrap=OsShellCmdFree",
# "-Wl,--wrap=_exit",
# "-Wl,--wrap=ioctl",
# "-Wl,--wrap=LOS_FsMount",
# "-Wl,--wrap=_exit",
# "-Wl,--wrap=ioctl",
# "-Wl,--wrap=LOS_FsMount",
"-u__cxx_fatal_exception",
"-Tesp32_out.ld",
"-uld_include_panic_highint_hdl",
"-Tesp32.project.ld",
"-Tesp32.peripherals.ld",
# "-Tesp32.rom.ld",
"-Tesp32.rom.libgcc.ld",
# "-Tesp32.rom.syscalls.ld",
# "-Tesp32.rom.newlib-data.ld",
# "-Tesp32.rom.api.ld",
"-Tesp32.rom.tw.ld",
# "-Tesp32.rom.newlib-funcs.ld",
# "-Tesp32.rom.newlib-time.ld",
"-Wl,--wrap=longjmp",
@@ -131,7 +131,7 @@ config("public") {
"-Wl,-EL",
"-fno-rtti",
]
defines = ["__XTENSA_LX6__=1"]
defines = [ "__XTENSA_LX6__=1" ]
libs = [
"c",
"m",
@@ -146,30 +146,30 @@ config("public") {
"xt_hal",
]
if(build_xts) {
if (build_xts) {
ldflags += [
"-Wl,--whole-archive",
"-lbootstrap",
"-lbroadcast",
"-lhctest",
"-lmodule_ActsSamgrTest",
# "-lmodule_ActsSamgrTest",
# "-lmodule_ActsUtilsFileTest",
# "-lmodule_ActsKvStoreTest",
# "-lmodule_ActsParameterTest",
# "-lmodule_ActsBootstrapTest",
"-lmodule_ActsUtilsFileTest",
"-lmodule_ActsKvStoreTest",
#"-lmodule_ActsParameterTest",
"-lmodule_ActsBootstrapTest",
"-lmodule_ActsDfxFuncTest",
"-lmodule_ActsHieventLiteTest",
"-lmodule_ActsWifiIotTest",
"-lmodule_ActsUpdaterFuncTest",
# "-lmodule_ActsWifiIotTest",
# "-lmodule_ActsUpdaterFuncTest",
"-lhuks_test_common",
"-lmodule_ActsHuksHalFunctionTest",
# "-lhuks_test_common",
# "-lmodule_ActsHuksHalFunctionTest",
"-Wl,--no-whole-archive",
]
defines += [
defines += [
"CONFIG_I2C_SUPPORT",
"CONFIG_PWM_SUPPORT",
"CONFIG_BUILD_TYPE_TEST",
@@ -82,7 +82,6 @@
#define MBEDTLS_SSL_SESSION_TICKETS
#define MBEDTLS_SSL_EXPORT_KEYS
#define MBEDTLS_SSL_SERVER_NAME_INDICATION
#define MBEDTLS_SSL_TRUNCATED_HMAC
#define MBEDTLS_VERSION_FEATURES
#define MBEDTLS_X509_CHECK_KEY_USAGE
#define MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
@@ -130,6 +129,7 @@
#define MBEDTLS_RIPEMD160_C
#define MBEDTLS_RSA_C
#define MBEDTLS_SHA1_C
#define MBEDTLS_SHA224_C
#define MBEDTLS_SHA256_C
#define MBEDTLS_SHA512_C
#define MBEDTLS_SSL_CACHE_C