modify the link.ld file and board/SConscript

8 files changed, 34 insertions, 34 deletions

diff --git a/bsp/tm4c123bsp/applications/main.c b/bsp/tm4c123bsp/applications/main.c
index ca99324e7f..3d5b70bcb9 100644
--- a/bsp/tm4c123bsp/applications/main.c
+++ b/bsp/tm4c123bsp/applications/main.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2019, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
- * 2018-11-06     SummerGift   first version
+ * 2020-06-27     AHTYDHD      the first version
  */
 
 #include <rtthread.h>
diff --git a/bsp/tm4c123bsp/board/SConscript b/bsp/tm4c123bsp/board/SConscript
index b9fc2bf5b5..87558a20ee 100644
--- a/bsp/tm4c123bsp/board/SConscript
+++ b/bsp/tm4c123bsp/board/SConscript
@@ -27,6 +27,7 @@ elif rtconfig.CROSS_TOOL == 'iar':
 
 CPPDEFINES = ['PART_TM4C123GH6PM']
 CPPDEFINES += ['TARGET_IS_TM4C123_RB1']
-CPPDEFINES += ['rvmdk']
+if rtconfig.CROSS_TOOL == 'keil':
+    CPPDEFINES += ['rvmdk']
 group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
 Return('group')
diff --git a/bsp/tm4c123bsp/board/board.h b/bsp/tm4c123bsp/board/board.h
index e702eb65ee..cd1647ec15 100644
--- a/bsp/tm4c123bsp/board/board.h
+++ b/bsp/tm4c123bsp/board/board.h
@@ -15,36 +15,36 @@
 #include <rtthread.h>
 
 #if defined(RT_USING_USER_MAIN) && defined(RT_USING_HEAP)
-#define TM4C123_SRAM1_START              (0x20000000)
-#define TM4C123_SRAM1_END                (TM4C123_SRAM1_START + 32 * 1024)   // end address = 0x20000000(base adddress) + 32K(RAM size)
+    #define TM4C123_SRAM1_START              (0x20000000)
+    #define TM4C123_SRAM1_END                (TM4C123_SRAM1_START + 32 * 1024)   // end address = 0x20000000(base adddress) + 32K(RAM size)
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM)
-extern int Image$$RW_IRAM$$ZI$$Limit;                   // RW_IRAM
-#define HEAP_BEGIN      ((void *)&Image$$RW_IRAM$$ZI$$Limit)
-#elif __ICCARM__
-#pragma section="HEAP"
-#define HEAP_BEGIN  (__segment_end("HEAP"))
-#else
-extern int _ebss;
-#define HEAP_BEGIN  ((void *)&_ebss)
-#endif
-#define HEAP_END                       TM4C123_SRAM1_END
+    #if defined(__CC_ARM) || defined(__CLANG_ARM)
+        extern int Image$$RW_IRAM$$ZI$$Limit;                   // RW_IRAM
+        #define HEAP_BEGIN      ((void *)&Image$$RW_IRAM$$ZI$$Limit)
+    #elif __ICCARM__
+        #pragma section="HEAP"
+        #define HEAP_BEGIN  (__segment_end("HEAP"))
+    #else
+        extern int _ebss;
+        #define HEAP_BEGIN  ((void *)&_ebss)
+    #endif
+    #define HEAP_END                       TM4C123_SRAM1_END
 #endif
 
 #ifdef RT_USING_PIN
-#include "drv_gpio.h"
+    #include "drv_gpio.h"
 #endif /* RT_USING_PIN */
 
 #ifdef RT_USING_SERIAL
-#include "drv_uart.h"
+    #include "drv_uart.h"
 #endif /* RT_USING_SERIAL */
 
 #ifdef RT_USING_PWM
-#include "drv_pwm.h"
+    #include "drv_pwm.h"
 #endif /* RT_USING_PWM*/
 
 #ifdef RT_USING_SPI
-#include "drv_spi.h"
+    #include "drv_spi.h"
 #endif /* RT_USING_SPI*/
 
 #endif /*__BOARD_H__*/
diff --git a/bsp/tm4c123bsp/board/linker_scripts/link.ld b/bsp/tm4c123bsp/board/linker_scripts/link.ld
index 64d9f0f9da..f207943565 100644
--- a/bsp/tm4c123bsp/board/linker_scripts/link.ld
+++ b/bsp/tm4c123bsp/board/linker_scripts/link.ld
@@ -39,7 +39,7 @@ SECTIONS
         _etext = .;
     } > FLASH
 
-    .data : AT(ADDR(.text) + SIZEOF(.text))
+    .data : AT(ADDR(.iplt) )
     {
         _data = .;
         _ldata = LOADADDR (.data);
diff --git a/bsp/tm4c123bsp/board/tm4c123_config.c b/bsp/tm4c123bsp/board/tm4c123_config.c
index f0be78a6fd..781f2a504e 100644
--- a/bsp/tm4c123bsp/board/tm4c123_config.c
+++ b/bsp/tm4c123bsp/board/tm4c123_config.c
@@ -18,16 +18,16 @@
 #include "tm4c123_config.h"
 
 #ifdef RT_USING_SERIAL
-#include "driverlib/uart.h"
+    #include "driverlib/uart.h"
 #endif /* RT_USING_SERIAL */
 #ifdef RT_USING_ADC
-#include "driverlib/adc.h"
+    #include "driverlib/adc.h"
 #endif /* RT_USING_ADC */
 #ifdef RT_USING_PWM
-#include "driverlib/pwm.h"
+    #include "driverlib/pwm.h"
 #endif /* RT_USING_PWM */
 #ifdef RT_USING_SPI
-#include "driverlib/ssi.h"
+    #include "driverlib/ssi.h"
 #endif /* RT_USING_SPI */
 
 
diff --git a/bsp/tm4c123bsp/libraries/Drivers/drv_adc.h b/bsp/tm4c123bsp/libraries/Drivers/drv_adc.h
index 0c6d3c3174..a552e5f047 100644
--- a/bsp/tm4c123bsp/libraries/Drivers/drv_adc.h
+++ b/bsp/tm4c123bsp/libraries/Drivers/drv_adc.h
@@ -1,6 +1,3 @@
-#ifndef _DRV_ADC_H_
-#define _DRV_ADC_H_
-
 /*
  * Copyright (c) 2006-2019, RT-Thread Development Team
  *
@@ -11,6 +8,9 @@
  * 2020-06-27     AHTYDHD      the first version
  */
 
+#ifndef __DRV_ADC_H__
+#define __DRV_ADC_H__
+
 #include<stdint.h>
 #include<rtthread.h>
 #include<rtdevice.h>
@@ -26,6 +26,6 @@ struct tm4c123_adc_config
     uint32_t    sequencepriority;
 };
 
-#endif /*_DRV_ADC_H_*/
+#endif /*__DRV_ADC_H__*/
 
 /************************** end of file ******************/
\ No newline at end of file
diff --git a/bsp/tm4c123bsp/libraries/Drivers/drv_gpio.h b/bsp/tm4c123bsp/libraries/Drivers/drv_gpio.h
index 3b1bb46cb4..5205367e8b 100644
--- a/bsp/tm4c123bsp/libraries/Drivers/drv_gpio.h
+++ b/bsp/tm4c123bsp/libraries/Drivers/drv_gpio.h
@@ -8,8 +8,8 @@
  * 2020-06-27     AHTYDHD      the first version
  */
 
-#ifndef _DRV_GPIO_H_
-#define _DRV_GPIO_H_
+#ifndef __DRV_GPIO_H__
+#define __DRV_GPIO_H__
 
 #include <stdint.h>
 #include <rtthread.h>
@@ -34,6 +34,6 @@ struct pin_index
 
 extern int rt_hw_pin_init(void);
 
-#endif  /*_DRV_GPIO_H_*/
+#endif  /*__DRV_GPIO_H__*/
 
 /************************** end of file ******************/
\ No newline at end of file
diff --git a/bsp/tm4c123bsp/libraries/Drivers/drv_uart.h b/bsp/tm4c123bsp/libraries/Drivers/drv_uart.h
index caeb4c57f5..44f8615008 100644
--- a/bsp/tm4c123bsp/libraries/Drivers/drv_uart.h
+++ b/bsp/tm4c123bsp/libraries/Drivers/drv_uart.h
@@ -23,8 +23,7 @@ struct tm4c123_uart_config
     uint32_t    uartbase;
     uint32_t    baudrate;
     uint32_t    mode;
-    //struct dma_config *dma_rx;
-    //struct dma_config *dma_tx;
+
 };
 
 /* tm4c123 uart dirver class */