Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PHPmihuan
rt-thread
提交
7d807229
R
rt-thread
项目概览
PHPmihuan
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
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,发现更多精彩内容 >>
提交
7d807229
编写于
5月 30, 2018
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/RT-Thread/rt-thread
上级
fd0ae672
e52bd1b8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
14 addition
and
7 deletion
+14
-7
bsp/imxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld
...mxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld
+6
-4
bsp/stm32f10x-HAL/drivers/board.c
bsp/stm32f10x-HAL/drivers/board.c
+5
-2
bsp/stm32f10x-HAL/drivers/drv_usart.c
bsp/stm32f10x-HAL/drivers/drv_usart.c
+3
-1
未找到文件。
bsp/imxrt1052-evk/Libraries/gcc/MIMXRT1052xxxxx_flexspi_nor.ld
浏览文件 @
7d807229
...
...
@@ -53,8 +53,8 @@ STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400;
/* Specify the memory areas */
MEMORY
{
m_boot_data (RX) : ORIGIN = 0x60000000, LENGTH = 0x0000
04
00
m_image_vertor_table (RX) : ORIGIN = 0x60001000, LENGTH = 0x0000
04
00
m_boot_data (RX) : ORIGIN = 0x60000000, LENGTH = 0x0000
10
00
m_image_vertor_table (RX) : ORIGIN = 0x60001000, LENGTH = 0x0000
10
00
m_interrupts (RX) : ORIGIN = 0x60002000, LENGTH = 0x00000400
m_text (RX) : ORIGIN = 0x60002400, LENGTH = 0x1F7FDC00
...
...
@@ -72,12 +72,14 @@ SECTIONS
{
.boot_data :
{
KEEP(*(.boot
data
))
KEEP(*(.boot
_hdr.conf
))
} > m_boot_data
.image_vertor_table :
{
KEEP(*(.ivt))
KEEP(*(.boot_hdr.ivt))
KEEP(*(.boot_hdr.boot_data))
KEEP(*(.boot_hdr.dcd_data))
} > m_image_vertor_table
/* The startup code goes first into internal RAM */
...
...
bsp/stm32f10x-HAL/drivers/board.c
浏览文件 @
7d807229
...
...
@@ -49,6 +49,7 @@ void HAL_MspInit(void)
void
SystemClock_Config
(
void
)
{
rt_err_t
result
;
RCC_OscInitTypeDef
RCC_OscInitStruct
;
RCC_ClkInitTypeDef
RCC_ClkInitStruct
;
/**Initializes the CPU, AHB and APB busses clocks
...
...
@@ -60,7 +61,8 @@ void SystemClock_Config(void)
RCC_OscInitStruct
.
PLL
.
PLLState
=
RCC_PLL_ON
;
RCC_OscInitStruct
.
PLL
.
PLLSource
=
RCC_PLLSOURCE_HSE
;
RCC_OscInitStruct
.
PLL
.
PLLMUL
=
RCC_PLL_MUL9
;
RT_ASSERT
(
HAL_RCC_OscConfig
(
&
RCC_OscInitStruct
)
==
HAL_OK
);
result
=
HAL_RCC_OscConfig
(
&
RCC_OscInitStruct
);
RT_ASSERT
(
result
==
HAL_OK
);
/**Initializes the CPU, AHB and APB busses clocks
*/
RCC_ClkInitStruct
.
ClockType
=
RCC_CLOCKTYPE_HCLK
|
RCC_CLOCKTYPE_SYSCLK
|
RCC_CLOCKTYPE_PCLK1
|
RCC_CLOCKTYPE_PCLK2
;
...
...
@@ -68,7 +70,8 @@ void SystemClock_Config(void)
RCC_ClkInitStruct
.
AHBCLKDivider
=
RCC_SYSCLK_DIV1
;
RCC_ClkInitStruct
.
APB1CLKDivider
=
RCC_HCLK_DIV2
;
RCC_ClkInitStruct
.
APB2CLKDivider
=
RCC_HCLK_DIV1
;
RT_ASSERT
(
HAL_RCC_ClockConfig
(
&
RCC_ClkInitStruct
,
FLASH_LATENCY_2
)
==
HAL_OK
);
result
=
HAL_RCC_ClockConfig
(
&
RCC_ClkInitStruct
,
FLASH_LATENCY_2
);
RT_ASSERT
(
result
==
HAL_OK
);
/**Configure the Systick interrupt time
*/
HAL_SYSTICK_Config
(
HAL_RCC_GetHCLKFreq
()
/
RT_TICK_PER_SECOND
);
...
...
bsp/stm32f10x-HAL/drivers/drv_usart.c
浏览文件 @
7d807229
...
...
@@ -267,6 +267,7 @@ INIT_BOARD_EXPORT(rt_hw_usart_init);
static
void
MX_USART_UART_Init
(
UART_HandleTypeDef
*
uartHandle
)
{
rt_err_t
result
;
uartHandle
->
Init
.
BaudRate
=
115200
;
uartHandle
->
Init
.
WordLength
=
UART_WORDLENGTH_8B
;
uartHandle
->
Init
.
StopBits
=
UART_STOPBITS_1
;
...
...
@@ -274,7 +275,8 @@ static void MX_USART_UART_Init(UART_HandleTypeDef *uartHandle)
uartHandle
->
Init
.
Mode
=
UART_MODE_TX_RX
;
uartHandle
->
Init
.
HwFlowCtl
=
UART_HWCONTROL_NONE
;
uartHandle
->
Init
.
OverSampling
=
UART_OVERSAMPLING_16
;
RT_ASSERT
(
HAL_UART_Init
(
uartHandle
)
==
HAL_OK
);
result
=
HAL_UART_Init
(
uartHandle
);
RT_ASSERT
(
result
==
HAL_OK
);
}
/* USART2 init function */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录