yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add third_party FatFs and fix BUILD.gn 

Change-Id: I456530ca5282d6c4b0904d04ae0a0a5ff155391a
This commit is contained in:
Caoruihong 2021-04-22 17:06:41 +08:00
parent 23360db35c
commit ad1e09ff77
17 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@ -1,8 +1,12 @@
[submodule "third_party/cmsis"] [submodule "third_party/cmsis"]
path = third_party/cmsis path = third_party/cmsis
url = ../third_party_cmsis.git url = https://gitee.com/openharmony/third_party_cmsis.git
branch = . branch = .
[submodule "third_party/bounds_checking_function"] [submodule "third_party/bounds_checking_function"]
path = third_party/bounds_checking_function path = third_party/bounds_checking_function
url = ../third_party_bounds_checking_function.git url = https://gitee.com/openharmony/third_party_bounds_checking_function.git
branch = .
[submodule "third_party/FatFs"]
path = third_party/FatFs
url = https://gitee.com/openharmony/third_party_FatFs.git
branch = . branch = .

2
BUILD.gn
View File

@ -38,9 +38,9 @@ declare_args() {
group("kernel") { group("kernel") {
deps = [ deps = [
"components/bounds_checking_function:sec",
"kernel:kernel", "kernel:kernel",
"utils:utils", "utils:utils",
"//third_party/bounds_checking_function:libsec_static",
] ]
if (enable_ohos_kernel_liteos_m_cppsupport == true) { if (enable_ohos_kernel_liteos_m_cppsupport == true) {
deps += [ "components/cppsupport:cppsupport" ] deps += [ "components/cppsupport:cppsupport" ]

3
components/backtrace/BUILD.gn
View File

@ -34,7 +34,6 @@ static_library("backtrace") {
"../../kernel/include", "../../kernel/include",
"../../kernel/arch/include", "../../kernel/arch/include",
"../../utils", "../../utils",
"./", "../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

5
components/cppsupport/BUILD.gn
View File

@ -30,8 +30,5 @@
static_library("cppsupport") { static_library("cppsupport") {
sources = [ "los_cppsupport.c" ] sources = [ "los_cppsupport.c" ]
include_dirs = [ include_dirs = [ "../../utils" ]
"../../utils",
"./",
]
} }

3
components/cpup/BUILD.gn
View File

@ -34,7 +34,6 @@ static_library("cpup") {
"../../kernel/include", "../../kernel/include",
"../../kernel/arch/include", "../../kernel/arch/include",
"../../utils", "../../utils",
"./", "../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

3
components/exchook/BUILD.gn
View File

@ -36,7 +36,6 @@ static_library("exchook") {
"../../kernel/arch/include", "../../kernel/arch/include",
"../../kernel/include", "../../kernel/include",
"../../utils", "../../utils",
"./", "../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

10
components/fs/fatfs/BUILD.gn
View File

@ -29,6 +29,10 @@
static_library("fatfs") { static_library("fatfs") {
sources = [ sources = [
"../../../third_party/FatFs/source/diskio.c",
"../../../third_party/FatFs/source/ff.c",
"../../../third_party/FatFs/source/ffsystem.c",
"../../../third_party/FatFs/source/ffunicode.c",
"fatfs.c", "fatfs.c",
"fs.c", "fs.c",
] ]
@ -38,10 +42,8 @@ static_library("fatfs") {
"../../../kernel/include", "../../../kernel/include",
"../../../utils", "../../../utils",
"../../../kal/cmsis", "../../../kal/cmsis",
"../../../kal",
"../../../kal/posix/include", "../../../kal/posix/include",
"./", "../../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include", "../../../third_party/FatFs/source/",
"//third_party/FatFs/source/",
] ]
} }

2
components/fs/fatfs/fatfs.c
View File

@ -41,7 +41,7 @@
#include "securec.h" #include "securec.h"
#include "los_compiler.h" #include "los_compiler.h"
#include "los_debug.h" #include "los_debug.h"
#include "cmsis_os.h" #include "cmsis_os2.h"
#define FS_SUCCESS 0 #define FS_SUCCESS 0
#define FS_FAILURE (-1) #define FS_FAILURE (-1)

1
kal/BUILD.gn
View File

@ -35,7 +35,6 @@ declare_args() {
} }
lite_component("kal") { lite_component("kal") {
features = [] features = []
if (enable_ohos_kernel_liteos_m_cmsis == true) { if (enable_ohos_kernel_liteos_m_cmsis == true) {

4
kal/posix/BUILD.gn
View File

@ -34,10 +34,10 @@ static_library("posix") {
"src/malloc.c", "src/malloc.c",
"src/pthread.c", "src/pthread.c",
"src/pthread_attr.c", "src/pthread_attr.c",
"src/pthread_cond.c",
"src/pthread_mutex.c", "src/pthread_mutex.c",
"src/semaphore.c", "src/semaphore.c",
"src/time.c", "src/time.c",
"src/pthread_cond.c",
] ]
include_dirs = [ include_dirs = [
@ -45,6 +45,6 @@ static_library("posix") {
"../../kernel/arch/include", "../../kernel/arch/include",
"../../kernel/include", "../../kernel/include",
"../../utils", "../../utils",
"//third_party/bounds_checking_function/include", "../../third_party/bounds_checking_function/include",
] ]
} }

2
kernel/BUILD.gn
View File

@ -47,7 +47,7 @@ static_library("kernel") {
"../components/cpup", "../components/cpup",
"../components/exchook", "../components/exchook",
"../utils", "../utils",
"//third_party/bounds_checking_function/include", "../third_party/bounds_checking_function/include",
] ]
if ("$board_cpu" == "cortex-m3") { if ("$board_cpu" == "cortex-m3") {

3
kernel/arch/arm/cortex-m33/gcc/BUILD.gn
View File

@ -40,7 +40,6 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"./", "../../../../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

3
kernel/arch/arm/cortex-m4/gcc/BUILD.gn
View File

@ -41,7 +41,6 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"./", "../../../../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

3
kernel/arch/arm/cortex-m7/gcc/BUILD.gn
View File

@ -40,7 +40,6 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"./", "../../../../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

5
kernel/arch/risc-v/riscv32/gcc/BUILD.gn
View File

@ -40,8 +40,7 @@ static_library("arch") {
"../../../../../kernel/arch/include", "../../../../../kernel/arch/include",
"../../../../../kernel/include", "../../../../../kernel/include",
"../../../../../utils", "../../../../../utils",
"./", "asm",
"./asm", "../../../../../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }

1
third_party/FatFs vendored Submodule

@ -0,0 +1 @@
Subproject commit fb2d8394023a6eef12c5bd3eda8978f5e294e070

3
utils/BUILD.gn
View File

@ -36,7 +36,6 @@ static_library("utils") {
include_dirs = [ include_dirs = [
"../kernel/include", "../kernel/include",
"../kernel/arch/include", "../kernel/arch/include",
"./", "../third_party/bounds_checking_function/include",
"//third_party/bounds_checking_function/include",
] ]
} }