Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢走~
rt-thread
提交
43f18b67
R
rt-thread
项目概览
慢慢走~
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
43f18b67
编写于
9月 02, 2018
作者:
B
Bernard Xiong
提交者:
GitHub
9月 02, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1761 from uestczyh222/master
[Bsp][Apollo2]fix build error with gcc
上级
5251ab73
2bd06ea4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
149 addition
and
9 deletion
+149
-9
.travis.yml
.travis.yml
+1
-1
bsp/apollo2/libraries/drivers/hal/am_hal_iom.c
bsp/apollo2/libraries/drivers/hal/am_hal_iom.c
+3
-5
bsp/apollo2/libraries/startup/SConscript
bsp/apollo2/libraries/startup/SConscript
+2
-2
bsp/apollo2/rtconfig.py
bsp/apollo2/rtconfig.py
+1
-1
bsp/apollo2/rtthread_link.ld
bsp/apollo2/rtthread_link.ld
+142
-0
未找到文件。
.travis.yml
浏览文件 @
43f18b67
...
...
@@ -24,7 +24,7 @@ script:
env
:
# - RTT_BSP='simulator' RTT_CC='clang-analyze' RTT_EXEC_PATH=/usr/share/clang/scan-build
-
RTT_BSP='CME_M7' RTT_TOOL_CHAIN='sourcery-arm'
#
- RTT_BSP='apollo2' RTT_TOOL_CHAIN='sourcery-arm'
-
RTT_BSP='apollo2' RTT_TOOL_CHAIN='sourcery-arm'
-
RTT_BSP='asm9260t' RTT_TOOL_CHAIN='sourcery-arm'
-
RTT_BSP='at91sam9260' RTT_TOOL_CHAIN='sourcery-arm'
-
RTT_BSP='allwinner_tina' RTT_TOOL_CHAIN='sourcery-arm'
...
...
bsp/apollo2/libraries/drivers/hal/am_hal_iom.c
浏览文件 @
43f18b67
...
...
@@ -1122,7 +1122,7 @@ am_hal_iom_workaround_word_write(uint32_t ui32ChipSelect,
//! @return None.
//
//*****************************************************************************
#if defined(__GNUC_
STDC_INLINE_
_)
#if defined(__GNUC__)
static
void
__attribute__
((
naked
))
iom_workaround_loop
(
uint32_t
ui32PadRegVal
,
volatile
uint32_t
*
pui32PadReg
,
bool
bRising
)
...
...
@@ -1164,8 +1164,7 @@ iom_workaround_loop(uint32_t ui32PadRegVal, volatile uint32_t *pui32PadReg,
__asm
(
" str r0, [r1]"
);
__asm
(
" bx lr"
);
}
#endif
#ifdef keil
#elif defined(__CC_ARM)
__asm
static
void
iom_workaround_loop
(
uint32_t
ui32PadRegVal
,
volatile
uint32_t
*
pui32PadReg
,
bool
bRising
)
...
...
@@ -1208,8 +1207,7 @@ falling_check_mosi
bx
lr
nop
}
#endif
#ifdef iar
#elif defined(__ICCARM__)
static
void
iom_workaround_loop
(
uint32_t
ui32PadRegVal
,
volatile
uint32_t
*
pui32PadReg
,
bool
bRising
)
...
...
bsp/apollo2/libraries/startup/SConscript
浏览文件 @
43f18b67
...
...
@@ -11,7 +11,7 @@ src = Split("""
# add for startup script
if
rtconfig
.
CROSS_TOOL
==
'gcc'
:
src
=
src
+
[
'gcc
_ride7
/'
+
'startup_gcc.c'
]
src
=
src
+
[
'gcc/'
+
'startup_gcc.c'
]
elif
rtconfig
.
CROSS_TOOL
==
'keil'
:
src
=
src
+
[
'arm/'
+
'startup_keil.s'
]
elif
rtconfig
.
CROSS_TOOL
==
'iar'
:
...
...
@@ -19,7 +19,7 @@ elif rtconfig.CROSS_TOOL == 'iar':
path
=
[
cwd
]
CPPDEFINES
=
[
'AM_PACKAGE_BGA'
,
'AM_PART_APOLLO2'
,
'keil'
]
CPPDEFINES
=
[
'AM_PACKAGE_BGA'
,
'AM_PART_APOLLO2'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/apollo2/rtconfig.py
浏览文件 @
43f18b67
...
...
@@ -43,7 +43,7 @@ if PLATFORM == 'gcc':
DEVICE
=
' -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections'
CFLAGS
=
DEVICE
AFLAGS
=
' -c'
+
DEVICE
+
' -x assembler-with-cpp'
LFLAGS
=
DEVICE
+
' -Wl,--gc-sections,-Map=rtthread-apollo2.map,-cref,-u,
Reset_Handler -T
'
LFLAGS
=
DEVICE
+
' -Wl,--gc-sections,-Map=rtthread-apollo2.map,-cref,-u,
am_reset_isr -T rtthread_link.ld
'
CPATH
=
''
LPATH
=
''
...
...
bsp/apollo2/rtthread_link.ld
0 → 100644
浏览文件 @
43f18b67
/*
* linker script for STM32F10x with GNU ld
* bernard.xiong 2009-10-14
*/
/* Program Entry, set to mark it as "used" and avoid gc */
MEMORY
{
CODE (rx) : ORIGIN = 0x00000000, LENGTH = 1024k /* 1024KB flash */
DATA (rw) : ORIGIN = 0x10000000, LENGTH = 256k /* 128K sram */
}
ENTRY(am_reset_isr)
_system_stack_size = 0x200;
SECTIONS
{
.text :
{
. = ALIGN(4);
_stext = .;
KEEP(*(.isr_vector)) /* Startup code */
. = ALIGN(4);
*(.text) /* remaining code */
*(.text.*) /* remaining code */
*(.rodata) /* read-only data (constants) */
*(.rodata*)
*(.glue_7)
*(.glue_7t)
*(.gnu.linkonce.t*)
/* section information for finsh shell */
. = ALIGN(4);
__fsymtab_start = .;
KEEP(*(FSymTab))
__fsymtab_end = .;
. = ALIGN(4);
__vsymtab_start = .;
KEEP(*(VSymTab))
__vsymtab_end = .;
. = ALIGN(4);
/* section information for initial. */
. = ALIGN(4);
__rt_init_start = .;
KEEP(*(SORT(.rti_fn*)))
__rt_init_end = .;
. = ALIGN(4);
. = ALIGN(4);
_etext = .;
} > CODE = 0
/* .ARM.exidx is sorted, so has to go in its own output section. */
__exidx_start = .;
.ARM.exidx :
{
*(.ARM.exidx* .gnu.linkonce.armexidx.*)
/* This is used by the startup in order to initialize the .data secion */
_init_data = .;
} > CODE
__exidx_end = .;
/* .data section which is used for initialized data */
.data : AT (_init_data)
{
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_sdata = . ;
*(.data)
*(.data.*)
*(.gnu.linkonce.d*)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_edata = . ;
} >DATA
.stack :
{
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
} >DATA
__bss_start = .;
.bss :
{
. = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */
_sbss = .;
*(.bss)
*(.bss.*)
*(COMMON)
. = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */
_ebss = . ;
*(.bss.init)
} > DATA
__bss_end = .;
_end = .;
/* Stabs debugging sections. */
.stab 0 : { *(.stab) }
.stabstr 0 : { *(.stabstr) }
.stab.excl 0 : { *(.stab.excl) }
.stab.exclstr 0 : { *(.stab.exclstr) }
.stab.index 0 : { *(.stab.index) }
.stab.indexstr 0 : { *(.stab.indexstr) }
.comment 0 : { *(.comment) }
/* DWARF debug sections.
* Symbols in the DWARF debugging sections are relative to the beginning
* of the section so we begin them at 0. */
/* DWARF 1 */
.debug 0 : { *(.debug) }
.line 0 : { *(.line) }
/* GNU DWARF 1 extensions */
.debug_srcinfo 0 : { *(.debug_srcinfo) }
.debug_sfnames 0 : { *(.debug_sfnames) }
/* DWARF 1.1 and DWARF 2 */
.debug_aranges 0 : { *(.debug_aranges) }
.debug_pubnames 0 : { *(.debug_pubnames) }
/* DWARF 2 */
.debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
.debug_abbrev 0 : { *(.debug_abbrev) }
.debug_line 0 : { *(.debug_line) }
.debug_frame 0 : { *(.debug_frame) }
.debug_str 0 : { *(.debug_str) }
.debug_loc 0 : { *(.debug_loc) }
.debug_macinfo 0 : { *(.debug_macinfo) }
/* SGI/MIPS DWARF 2 extensions */
.debug_weaknames 0 : { *(.debug_weaknames) }
.debug_funcnames 0 : { *(.debug_funcnames) }
.debug_typenames 0 : { *(.debug_typenames) }
.debug_varnames 0 : { *(.debug_varnames) }
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录