fix: M核编译配置修改

【背景】完善M核编译配置选项。

【修改方案】
1,在build.gn中添加config.gni的包含
2,修改部分build.gn中的格式规范问题

【影响】
对现有的产品编译不会有影响。

re #I46XEA
Signed-off-by: wangchen <253227059@qq.com>
This commit is contained in:
wangchen 2021-08-24 10:04:24 +08:00
parent e4e3caccf2
commit deff7c921f
7 changed files with 23 additions and 21 deletions

View File

@ -35,40 +35,40 @@ group("kernel") {
"utils:utils",
"//third_party/bounds_checking_function:libsec_static",
]
if (enable_ohos_kernel_liteos_m_cppsupport == true) {
if (enable_ohos_kernel_liteos_m_cppsupport) {
deps += [ "components/cppsupport:cppsupport" ]
}
if (enable_ohos_kernel_liteos_m_cpup == true) {
if (enable_ohos_kernel_liteos_m_cpup) {
deps += [ "components/cpup:cpup" ]
}
if (enable_ohos_kernel_liteos_m_exchook == true) {
if (enable_ohos_kernel_liteos_m_exchook) {
deps += [ "components/exchook:exchook" ]
}
if (enable_ohos_kernel_liteos_m_backtrace == true) {
if (enable_ohos_kernel_liteos_m_backtrace) {
deps += [ "components/backtrace:backtrace" ]
}
if (enable_ohos_kernel_liteos_m_fs == true) {
if (enable_ohos_kernel_liteos_m_fs) {
deps += [ "components/fs:fs" ]
}
if (enable_ohos_kernel_liteos_m_pm == true) {
if (enable_ohos_kernel_liteos_m_pm) {
deps += [ "components/power:pm" ]
}
if (enable_ohos_kernel_liteos_m_trace == true) {
if (enable_ohos_kernel_liteos_m_trace) {
deps += [ "components/trace:trace" ]
}
if (enable_ohos_kernel_liteos_m_kal == true) {
if (enable_ohos_kernel_liteos_m_kal) {
deps += [ "kal:kal" ]
}
if (enable_ohos_kernel_liteos_m_shell == true) {
if (enable_ohos_kernel_liteos_m_shell) {
deps += [ "components/shell:shell" ]
}
if (enable_ohos_kernel_liteos_m_test == true) {
if (enable_ohos_kernel_liteos_m_test) {
deps += [ "testsuits:test" ]
}
if (enable_ohos_kernel_liteos_m_lwip == true) {
if (enable_ohos_kernel_liteos_m_lwip) {
deps += [ ohos_kernel_liteos_m_lwip_path ]
}
if (enable_ohos_kernel_liteos_m_dynlink == true) {
if (enable_ohos_kernel_liteos_m_dynlink) {
deps += [ "components/dynlink:dynlink" ]
}
}

View File

@ -49,10 +49,10 @@ declare_args() {
group("fs") {
deps = []
deps += [ ".:fs_operations" ]
if (enable_ohos_kernel_liteos_m_fatfs == true) {
if (enable_ohos_kernel_liteos_m_fatfs) {
deps += [ "fatfs:fatfs" ]
}
if (enable_ohos_kernel_liteos_m_littlefs == true) {
if (enable_ohos_kernel_liteos_m_littlefs) {
deps += [ "littlefs:littlefs" ]
}
}

View File

@ -40,6 +40,6 @@ LWIP_PORTING_FILES = [
"$LWIP_PORTING_DIR/enhancement/src/lwip_ifaddrs.c",
]
if (enable_ohos_kernel_liteos_m_shell == true) {
if (enable_ohos_kernel_liteos_m_shell) {
LWIP_PORTING_FILES += [ "$LWIP_PORTING_DIR/porting/src/api_shell.c" ]
}

View File

@ -50,7 +50,7 @@ static_library("shell") {
"./include",
]
if (enable_ohos_kernel_liteos_m_lwip == true) {
if (enable_ohos_kernel_liteos_m_lwip) {
defines = [ "LWIP_SHELLCMD_ENABLE" ]
}
deps = [

View File

@ -37,11 +37,11 @@ declare_args() {
lite_component("kal") {
features = []
if (enable_ohos_kernel_liteos_m_cmsis == true) {
if (enable_ohos_kernel_liteos_m_cmsis) {
features += [ "cmsis" ]
}
if (enable_ohos_kernel_liteos_m_posix == true) {
if (enable_ohos_kernel_liteos_m_posix) {
features += [ "posix" ]
}
}

View File

@ -27,6 +27,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import("../config.gni")
static_library("kernel") {
sources = [
"src/los_event.c",
@ -62,7 +64,7 @@ static_library("kernel") {
} else if ("$board_cpu" == "cortex-m7") {
deps = [ "arch/arm/cortex-m7/gcc/:arch" ]
} else if ("$board_cpu" == "cortex-m33") {
if (enable_ohos_kernel_liteos_m_tz == true) {
if (enable_ohos_kernel_liteos_m_tz) {
deps = [ "arch/arm/cortex-m33/gcc/TZ:arch" ]
} else {
deps = [ "arch/arm/cortex-m33/gcc/NTZ:arch" ]

View File

@ -43,7 +43,7 @@ config("include") {
"//kernel/liteos_m/components/cpup",
]
if (enable_ohos_kernel_liteos_m_test_full == true) {
if (enable_ohos_kernel_liteos_m_test_full) {
defines += [ "LOS_KERNEL_TEST_FULL=1" ]
}
}
@ -71,7 +71,7 @@ lite_component("test") {
#"sample/kernel/tickless:test_tickless",
]
if (enable_ohos_kernel_liteos_m_dynlink == true) {
if (enable_ohos_kernel_liteos_m_dynlink) {
features += [ "sample/kernel/dynlink:test_dynlink" ]
}
}