Skip to content

Commit 7c71cfd

Browse files
committed
Merge branch 'sync_bsp'
2 parents 22123a3 + 228dfe5 commit 7c71cfd

File tree

626 files changed

+68250
-66798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

626 files changed

+68250
-66798
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "os/freertos"]
2+
path = os/freertos
3+
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ env:
1414
"context": "travis-ci/$NAME",
1515
"target_url": "https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$TRAVIS_JOB_ID"
1616
}\nDATA'
17-
18-
COMMENT=none
19-
COMMENTS=$'curl -so/dev/null --user "$EMBARC_BOT" --request POST
20-
https://api.github.com/repos/$TRAVIS_REPO_SLUG/issues/$TRAVIS_PULL_REQUEST/comments
21-
--data @- << DATA\n{
22-
"body": "$COMMENT"
23-
}\nDATA'
17+
2418
- TOOLCHAIN_VER="2020.09"
2519
- OSP_ROOT="."
2620
- EXAMPLES="example/baremetal,example/freertos"
@@ -39,7 +33,7 @@ before_install:
3933
# setup git config
4034
- git config --global user.name "embARC Automated Bot"
4135
- git config --global user.email "jingru@synopsys.com"
42-
- bash .ci/before_install.sh
36+
- bash ./scripts/.ci/before_install.sh
4337

4438
after_success:
4539
- bash -c "$STATUS" success "Local $NAME testing has passed"
@@ -48,7 +42,7 @@ after_failure:
4842
- bash -c "$STATUS" failure "Local $NAME testing has failed"
4943

5044
script:
51-
- bash .ci/script.sh
45+
- bash ./scripts/.ci/script.sh
5246

5347
matrix:
5448
include:

.uncrustify.cfg

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#
2+
# uncrustify config file for the embARC
3+
#
4+
5+
indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs
6+
input_tab_size = 8 # original tab size
7+
output_tab_size = 8 # new tab size
8+
indent_columns = output_tab_size
9+
indent_label = 1 # pos: absolute col, neg: relative column
10+
indent_switch_case = 0
11+
12+
#
13+
# inter-symbol newlines
14+
# select "remove" or "add" or "force"
15+
#
16+
nl_max = 2 # max 2 new lines
17+
nl_enum_brace = remove # "enum {" vs "enum \n {"
18+
nl_union_brace = remove # "union {" vs "union \n {"
19+
nl_struct_brace = remove # "struct {" vs "struct \n {"
20+
nl_do_brace = remove # "do {" vs "do \n {"
21+
nl_if_brace = remove # "if () {" vs "if () \n {"
22+
nl_for_brace = remove # "for () {" vs "for () \n {"
23+
nl_else_brace = remove # "else {" vs "else \n {"
24+
nl_while_brace = remove # "while () {" vs "while () \n {"
25+
nl_switch_brace = remove # "switch () {" vs "switch () \n {"
26+
nl_brace_while = remove # "} while" vs "} \n while" - cuddle while
27+
nl_brace_else = remove # "} else" vs "} \n else" - cuddle else
28+
nl_func_var_def_blk = 1
29+
nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{"
30+
nl_fdef_brace = add # "int foo() {" vs "int foo()\n{"
31+
# nl_after_return = TRUE;
32+
# nl_before_case = 1
33+
34+
35+
#
36+
# Source code modifications
37+
#
38+
39+
mod_paren_on_return = ignore # "return 1;" vs "return (1);"
40+
mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }"
41+
mod_full_brace_for = add # "for () a--;" vs "for () { a--; }"
42+
mod_full_brace_do = add # "do a--; while ();" vs "do { a--; } while ();"
43+
mod_full_brace_while = add # "while (a) a--;" vs "while (a) { a--; }"
44+
45+
46+
#
47+
# inter-character spacing options
48+
#
49+
50+
# sp_return_paren = force # "return (1);" vs "return(1);"
51+
sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)"
52+
sp_before_sparen = force # "if (" vs "if("
53+
sp_after_sparen = force # "if () {" vs "if (){"
54+
sp_inside_braces = add # "{ 1 }" vs "{1}"
55+
sp_inside_braces_struct = add # "{ 1 }" vs "{1}"
56+
sp_inside_braces_enum = add # "{ 1 }" vs "{1}"
57+
sp_assign = add
58+
sp_arith = add
59+
sp_bool = add
60+
sp_compare = add
61+
sp_assign = add
62+
sp_after_comma = add
63+
sp_func_def_paren = remove # "int foo (){" vs "int foo(){"
64+
sp_func_call_paren = remove # "foo (" vs "foo("
65+
sp_func_proto_paren = remove # "int foo ();" vs "int foo();"
66+
sp_inside_fparen = remove # "func( arg )" vs "func(arg)"
67+
sp_else_brace = add # ignore/add/remove/force
68+
sp_before_ptr_star = add # ignore/add/remove/force
69+
sp_after_ptr_star = remove # ignore/add/remove/force
70+
sp_between_ptr_star = remove # ignore/add/remove/force
71+
sp_inside_paren = remove # remove spaces inside parens
72+
sp_paren_paren = remove # remove spaces between nested parens
73+
sp_inside_sparen = remove # remove spaces inside parens for if, while and the like
74+
sp_brace_else = add # ignore/add/remove/force
75+
sp_before_nl_cont = ignore
76+
sp_cmt_cpp_start = add
77+
sp_brace_typedef = add # }typedefd_name -> } typedefd_name
78+
79+
cmt_sp_after_star_cont = 1
80+
81+
#
82+
# Aligning stuff
83+
#
84+
85+
align_with_tabs = FALSE # use tabs to align
86+
align_on_tabstop = TRUE # align on tabstops
87+
align_enum_equ_span = 4 # '=' in enum definition
88+
align_nl_cont = TRUE
89+
# align_var_def_span = 2
90+
# align_var_def_inline = TRUE
91+
# align_var_def_star = FALSE
92+
# align_var_def_colon = TRUE
93+
# align_assign_span = 1
94+
align_struct_init_span = 0 # align stuff in a structure init '= { }'
95+
align_right_cmt_span = 3
96+
# align_pp_define_span = 8;
97+
# align_pp_define_gap = 4;
98+
99+
# cmt_star_cont = FALSE
100+
101+
# indent_brace = 0
102+
103+
sp_pp_concat = ignore # ignore/add/remove/force
104+

arc/arc.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## CPU Related ##
22
# CPU root declaration
3+
ARC_ISA_VER ?= 2
34
CPUS_ROOT = $(EMBARC_ROOT)/arc
45

56
EXTRA_CSRCDIR += $(EMBARC_ROOT)/arc/startup
@@ -32,7 +33,7 @@ CPU_ARC_DIR = $(CPUS_ROOT)
3233

3334
CPU_ARC_ASMSRCDIR = $(CPU_ARC_DIR)
3435
CPU_ARC_CSRCDIR = $(CPU_ARC_DIR)
35-
CPU_ARC_INCDIR = $(CPU_ARC_DIR)
36+
CPU_ARC_INCDIR =
3637

3738
# find all the source files in the target directories
3839
CPU_ARC_CSRCS = $(call get_csrcs, $(CPU_ARC_CSRCDIR))

0 commit comments

Comments
 (0)