summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhkag <[email protected]>2023-07-05 18:20:08 +0800
committerGitHub <[email protected]>2023-07-05 18:20:08 +0800
commit9c14c518dba994eebbaa120b6600275aff92c5e0 (patch)
tree6544e6e480bc475fcb4e3b25af4d57fdb3776997
parentaf01d1fd1ccecfcefe535060de678651760a92f1 (diff)
[bsp][mm32] 修复编译问题 (#7780)
Co-authored-by: Supper Thomas <[email protected]>
-rw-r--r--bsp/mm32f103x/drivers/board.h2
-rw-r--r--bsp/mm32f327x/Libraries/SConscript2
-rw-r--r--bsp/mm32f327x/applications/main.c2
-rw-r--r--bsp/mm32f327x/drivers/drv_uart.c2
-rw-r--r--bsp/mm32l07x/drivers/board.h2
-rw-r--r--bsp/mm32l07x/rtconfig.py2
-rw-r--r--bsp/mm32l3xx/drivers/board.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/bsp/mm32f103x/drivers/board.h b/bsp/mm32f103x/drivers/board.h
index 60c0f4ff66..af1bb6fd37 100644
--- a/bsp/mm32f103x/drivers/board.h
+++ b/bsp/mm32f103x/drivers/board.h
@@ -11,7 +11,7 @@
#ifndef BOARD_H__
#define BOARD_H__
#include <rtthread.h>
-#include <hal_device.h>
+#include <HAL_device.h>
#define SRAM_SIZE 0x5000
diff --git a/bsp/mm32f327x/Libraries/SConscript b/bsp/mm32f327x/Libraries/SConscript
index 34781346d8..d09c142467 100644
--- a/bsp/mm32f327x/Libraries/SConscript
+++ b/bsp/mm32f327x/Libraries/SConscript
@@ -2,7 +2,7 @@ from building import *
import rtconfig
cwd = GetCurrentDir()
src = ['MM32F327x/Source/system_mm32f327x.c']
-CPPPATH = [cwd + '/CMSIS/KEIL_CORE', cwd + '/MM32F327x/Include', cwd + '/MM32F327x/Source', cwd + '/MM32F327x/HAL_lib/Inc']
+CPPPATH = [cwd + '/CMSIS/KEIL_CORE', cwd + '/MM32F327x/Include', cwd + '/MM32F327x/Source', cwd + '/MM32F327x/HAL_Lib/Inc']
src += Glob('MM32F327x/HAL_lib/src/*.c')
CPPDEFINES = ['USE_STDPERIPH_DRIVER']
diff --git a/bsp/mm32f327x/applications/main.c b/bsp/mm32f327x/applications/main.c
index 8f91379865..09c50c4038 100644
--- a/bsp/mm32f327x/applications/main.c
+++ b/bsp/mm32f327x/applications/main.c
@@ -10,7 +10,7 @@
#include <rtthread.h>
#include <rtdevice.h>
-#include "HAL_device.h"
+#include "hal_device.h"
/* defined the LED pin: PA15 */
#define LED_PIN 38
int main(void)
diff --git a/bsp/mm32f327x/drivers/drv_uart.c b/bsp/mm32f327x/drivers/drv_uart.c
index 7445ce798b..44c4a17619 100644
--- a/bsp/mm32f327x/drivers/drv_uart.c
+++ b/bsp/mm32f327x/drivers/drv_uart.c
@@ -7,7 +7,7 @@
* Date Author Notes
* 2021-08-05 mazhiyuan first version
*/
-#include <HAL_device.h>
+#include <hal_device.h>
#include <rtdevice.h>
#include "drv_uart.h"
#include <hal_gpio.h>
diff --git a/bsp/mm32l07x/drivers/board.h b/bsp/mm32l07x/drivers/board.h
index fc2da93b0e..6f076216bf 100644
--- a/bsp/mm32l07x/drivers/board.h
+++ b/bsp/mm32l07x/drivers/board.h
@@ -11,7 +11,7 @@
#ifndef BOARD_H__
#define BOARD_H__
#include <rtthread.h>
-#include <hal_device.h>
+#include <HAL_device.h>
#define SRAM_SIZE 0x2000
diff --git a/bsp/mm32l07x/rtconfig.py b/bsp/mm32l07x/rtconfig.py
index 2194a68adf..b308dd9a30 100644
--- a/bsp/mm32l07x/rtconfig.py
+++ b/bsp/mm32l07x/rtconfig.py
@@ -42,7 +42,7 @@ if PLATFORM == 'gcc':
OBJDUMP = PREFIX + 'objdump'
OBJCPY = PREFIX + 'objcopy'
- DEVICE = ' -mcpu=' + CPU + '-mthumb -ffunction-sections -fdata-sections -Wall'
+ DEVICE = ' -mcpu=' + CPU + ' -mthumb -ffunction-sections -fdata-sections -Wall'
CFLAGS = DEVICE + ' -std=c99'
AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb '
LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T drivers/linker_scripts/link.lds'
diff --git a/bsp/mm32l3xx/drivers/board.h b/bsp/mm32l3xx/drivers/board.h
index 60c0f4ff66..af1bb6fd37 100644
--- a/bsp/mm32l3xx/drivers/board.h
+++ b/bsp/mm32l3xx/drivers/board.h
@@ -11,7 +11,7 @@
#ifndef BOARD_H__
#define BOARD_H__
#include <rtthread.h>
-#include <hal_device.h>
+#include <HAL_device.h>
#define SRAM_SIZE 0x5000