Merge pull request #1202 from xeonxu/fix_gcc

Fixed #1187 running issue while using firmware compiled by gcc.
2018-02-02 21:18:03 +08:00 · 2018-02-02 21:18:03 +08:00 · 0979e30caa
parent 9d59b30c21 37660ac515
commit 0979e30caa
16 changed files with 113 additions and 54 deletions
--- a/bsp/stm32f10x-HAL/.config
+++ b/bsp/stm32f10x-HAL/.config
@ -40,6 +40,7 @@ CONFIG_RT_USING_MEMHEAP=y
 CONFIG_RT_USING_SMALL_MEM=y
 # CONFIG_RT_USING_SLAB is not set
 # CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set
+# CONFIG_RT_USING_MEMTRACE is not set
 CONFIG_RT_USING_HEAP=y

 #
@ -49,7 +50,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=128
-CONFIG_RT_CONSOLE_DEVICE_NAME="uart2"
+CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 # CONFIG_RT_USING_MODULE is not set

 #
@ -67,7 +68,9 @@ CONFIG_RT_USING_USER_MAIN=y
 # Command shell
 #
 CONFIG_RT_USING_FINSH=y
+CONFIG_FINSH_THREAD_NAME="tshell"
 CONFIG_FINSH_USING_HISTORY=y
+CONFIG_FINSH_HISTORY_LINES=5
 CONFIG_FINSH_USING_SYMTAB=y
 CONFIG_FINSH_USING_DESCRIPTION=y
 CONFIG_FINSH_THREAD_PRIORITY=20
@ -90,6 +93,7 @@ CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_USING_SERIAL=y
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
+# CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_MTD_NOR is not set
@ -98,6 +102,7 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_SDIO is not set
 # CONFIG_RT_USING_SPI is not set
 # CONFIG_RT_USING_WDT is not set
+# CONFIG_RT_USING_WIFI is not set

 #
 # Using USB
@ -108,7 +113,7 @@ CONFIG_RT_USING_PIN=y
 #
 # POSIX layer and C standard library
 #
-# CONFIG_RT_USING_LIBC is not set
+CONFIG_RT_USING_LIBC=y
 # CONFIG_RT_USING_PTHREADS is not set

 #
@ -135,6 +140,12 @@ CONFIG_RT_USING_PIN=y
 #
 # CONFIG_RT_USING_VBUS is not set

+#
+# Utilities
+#
+# CONFIG_RT_USING_LOGTRACE is not set
+# CONFIG_RT_USING_RYM is not set
+
 #
 # RT-Thread online packages
 #
@ -144,67 +155,90 @@ CONFIG_RT_USING_PIN=y
 #
 # CONFIG_PKG_USING_PARTITION is not set
 # CONFIG_PKG_USING_SQLITE is not set
+# CONFIG_PKG_USING_RTI is not set

 #
 # IoT - internet of things
 #
-# CONFIG_PKG_USING_CJSON is not set
 # CONFIG_PKG_USING_PAHOMQTT is not set
 # CONFIG_PKG_USING_WEBCLIENT is not set
 # CONFIG_PKG_USING_MONGOOSE is not set
 # CONFIG_PKG_USING_WEBTERMINAL is not set
+# CONFIG_PKG_USING_CJSON is not set
+# CONFIG_PKG_USING_LJSON is not set
+# CONFIG_PKG_USING_EZXML is not set
+# CONFIG_PKG_USING_NANOPB is not set
+# CONFIG_PKG_USING_GAGENT_CLOUD is not set
+
+#
+# Wi-Fi
+#
+
+#
+# Marvell WiFi
+#
+# CONFIG_PKG_USING_WLANMARVELL is not set
+
+#
+# Wiced WiFi
+#
+# CONFIG_PKG_USING_WLAN_WICED is not set
+# CONFIG_PKG_USING_COAP is not set
+# CONFIG_PKG_USING_NOPOLL is not set

 #
 # security packages
 #
 # CONFIG_PKG_USING_MBEDTLS is not set
+# CONFIG_PKG_USING_libsodium is not set
+# CONFIG_PKG_USING_TINYCRYPT is not set

 #
 # language packages
 #
 # CONFIG_PKG_USING_JERRYSCRIPT is not set
+# CONFIG_PKG_USING_MICROPYTHON is not set

 #
 # multimedia packages
 #
+# CONFIG_PKG_USING_OPENMV is not set

 #
 # tools packages
 #
 # CONFIG_PKG_USING_CMBACKTRACE is not set
 # CONFIG_PKG_USING_EASYLOGGER is not set
+# CONFIG_PKG_USING_SYSTEMVIEW is not set
+# CONFIG_PKG_USING_IPERF is not set

 #
 # miscellaneous packages
 #
+# CONFIG_PKG_USING_FASTLZ is not set
+# CONFIG_PKG_USING_MINILZO is not set
+
+#
+# example package: hello
+#
 # CONFIG_PKG_USING_HELLO is not set
-# CONFIG_STM32F100C8 is not set
-# CONFIG_STM32F100CB is not set
-# CONFIG_STM32F100R8 is not set
-# CONFIG_STM32F100RB is not set
 # CONFIG_STM32F100RC is not set
 # CONFIG_STM32F100RD is not set
 # CONFIG_STM32F100RE is not set
-# CONFIG_STM32F100V8 is not set
-# CONFIG_STM32F100VB is not set
 # CONFIG_STM32F100VC is not set
 # CONFIG_STM32F100VD is not set
 # CONFIG_STM32F100VE is not set
 # CONFIG_STM32F100ZC is not set
 # CONFIG_STM32F100ZD is not set
 # CONFIG_STM32F100ZE is not set
-# CONFIG_STM32F101C8 is not set
 # CONFIG_STM32F101CB is not set
-# CONFIG_STM32F101R8 is not set
 # CONFIG_STM32F101RB is not set
 # CONFIG_STM32F101RC is not set
 # CONFIG_STM32F101RD is not set
 # CONFIG_STM32F101RE is not set
 # CONFIG_STM32F101RF is not set
 # CONFIG_STM32F101RG is not set
-# CONFIG_STM32F101T8 is not set
 # CONFIG_STM32F101TB is not set
-# CONFIG_STM32F101V8 is not set
 # CONFIG_STM32F101VB is not set
 # CONFIG_STM32F101VC is not set
 # CONFIG_STM32F101VD is not set
@ -216,15 +250,13 @@ CONFIG_RT_USING_PIN=y
 # CONFIG_STM32F101ZE is not set
 # CONFIG_STM32F101ZF is not set
 # CONFIG_STM32F101ZG is not set
-# CONFIG_STM32F102C8 is not set
 # CONFIG_STM32F102CB is not set
-# CONFIG_STM32F102R8 is not set
 # CONFIG_STM32F102RB is not set
 # CONFIG_STM32F103C8 is not set
 # CONFIG_STM32F103CB is not set
 # CONFIG_STM32F103R8 is not set
-CONFIG_STM32F103RB=y
-# CONFIG_STM32F103RC is not set
+# CONFIG_STM32F103RB is not set
+CONFIG_STM32F103RC=y
 # CONFIG_STM32F103RD is not set
 # CONFIG_STM32F103RE is not set
 # CONFIG_STM32F103RF is not set
@ -255,7 +287,7 @@ CONFIG_STM32F103RB=y
 # CONFIG_STM32F107VC is not set
 # CONFIG_RT_USING_HSI is not set
 CONFIG_RT_HSE_VALUE=8000000
-CONFIG_STM32F10X_PIN_NUMBERS=64
-# CONFIG_RT_USING_UART1 is not set
-CONFIG_RT_USING_UART2=y
+CONFIG_RT_USING_UART1=y
+# CONFIG_RT_USING_UART2 is not set
 # CONFIG_RT_USING_UART3 is not set
+# CONFIG_RT_USING_SDCARD is not set
--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f100xb.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f100xb.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f100xe.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f100xe.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101x6.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101x6.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xb.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xb.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xe.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xe.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xg.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xg.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f102x6.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f102x6.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f102xb.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f102xb.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103x6.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103x6.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s
@ -111,7 +111,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s
@ -113,7 +113,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xg.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xg.s
@ -112,7 +112,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f105xc.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f105xc.s
@ -109,7 +109,7 @@ LoopFillZerobss:
 /* Call the clock system intitialization function.*/
    bl  SystemInit
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f107xc.s
+++ b/bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f107xc.s
@ -112,7 +112,7 @@ LoopFillZerobss:
 /* Call static constructors */
    bl __libc_init_array
 /* Call the application's entry point.*/
-  bl main
+  bl entry
  bx lr
 .size Reset_Handler, .-Reset_Handler

--- a/bsp/stm32f10x-HAL/rtconfig.h
+++ b/bsp/stm32f10x-HAL/rtconfig.h
@ -38,6 +38,7 @@
 #define RT_USING_SMALL_MEM
 /* RT_USING_SLAB is not set */
 /* RT_USING_MEMHEAP_AS_HEAP is not set */
+/* RT_USING_MEMTRACE is not set */
 #define RT_USING_HEAP

 /* Kernel Device Object */
@ -46,7 +47,7 @@
 /* RT_USING_INTERRUPT_INFO is not set */
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
-#define RT_CONSOLE_DEVICE_NAME "uart2"
+#define RT_CONSOLE_DEVICE_NAME "uart1"
 /* RT_USING_MODULE is not set */

 /* RT-Thread Components */
@ -61,7 +62,9 @@
 /* Command shell */

 #define RT_USING_FINSH
+#define FINSH_THREAD_NAME "tshell"
 #define FINSH_USING_HISTORY
+#define FINSH_HISTORY_LINES 5
 #define FINSH_USING_SYMTAB
 #define FINSH_USING_DESCRIPTION
 #define FINSH_THREAD_PRIORITY 20
@ -82,6 +85,7 @@
 #define RT_USING_SERIAL
 /* RT_USING_CAN is not set */
 /* RT_USING_HWTIMER is not set */
+/* RT_USING_CPUTIME is not set */
 /* RT_USING_I2C is not set */
 #define RT_USING_PIN
 /* RT_USING_MTD_NOR is not set */
@ -90,6 +94,7 @@
 /* RT_USING_SDIO is not set */
 /* RT_USING_SPI is not set */
 /* RT_USING_WDT is not set */
+/* RT_USING_WIFI is not set */

 /* Using USB */

@ -98,7 +103,7 @@

 /* POSIX layer and C standard library */

-/* RT_USING_LIBC is not set */
+#define RT_USING_LIBC
 /* RT_USING_PTHREADS is not set */

 /* Network stack */
@ -119,66 +124,90 @@

 /* RT_USING_VBUS is not set */

+/* Utilities */
+
+/* RT_USING_LOGTRACE is not set */
+/* RT_USING_RYM is not set */
+
 /* RT-Thread online packages */

 /* system packages */

 /* PKG_USING_PARTITION is not set */
 /* PKG_USING_SQLITE is not set */
+/* PKG_USING_RTI is not set */

 /* IoT - internet of things */

-/* PKG_USING_CJSON is not set */
 /* PKG_USING_PAHOMQTT is not set */
 /* PKG_USING_WEBCLIENT is not set */
 /* PKG_USING_MONGOOSE is not set */
 /* PKG_USING_WEBTERMINAL is not set */
+/* PKG_USING_CJSON is not set */
+/* PKG_USING_LJSON is not set */
+/* PKG_USING_EZXML is not set */
+/* PKG_USING_NANOPB is not set */
+/* PKG_USING_GAGENT_CLOUD is not set */
+
+/* Wi-Fi */
+
+/* Marvell WiFi */
+
+/* PKG_USING_WLANMARVELL is not set */
+
+/* Wiced WiFi */
+
+/* PKG_USING_WLAN_WICED is not set */
+/* PKG_USING_COAP is not set */
+/* PKG_USING_NOPOLL is not set */

 /* security packages */

 /* PKG_USING_MBEDTLS is not set */
+/* PKG_USING_libsodium is not set */
+/* PKG_USING_TINYCRYPT is not set */

 /* language packages */

 /* PKG_USING_JERRYSCRIPT is not set */
+/* PKG_USING_MICROPYTHON is not set */

 /* multimedia packages */

+/* PKG_USING_OPENMV is not set */
+
 /* tools packages */

 /* PKG_USING_CMBACKTRACE is not set */
 /* PKG_USING_EASYLOGGER is not set */
+/* PKG_USING_SYSTEMVIEW is not set */
+/* PKG_USING_IPERF is not set */

 /* miscellaneous packages */

+/* PKG_USING_FASTLZ is not set */
+/* PKG_USING_MINILZO is not set */
+
+/* example package: hello */
+
 /* PKG_USING_HELLO is not set */
-/* STM32F100C8 is not set */
-/* STM32F100CB is not set */
-/* STM32F100R8 is not set */
-/* STM32F100RB is not set */
 /* STM32F100RC is not set */
 /* STM32F100RD is not set */
 /* STM32F100RE is not set */
-/* STM32F100V8 is not set */
-/* STM32F100VB is not set */
 /* STM32F100VC is not set */
 /* STM32F100VD is not set */
 /* STM32F100VE is not set */
 /* STM32F100ZC is not set */
 /* STM32F100ZD is not set */
 /* STM32F100ZE is not set */
-/* STM32F101C8 is not set */
 /* STM32F101CB is not set */
-/* STM32F101R8 is not set */
 /* STM32F101RB is not set */
 /* STM32F101RC is not set */
 /* STM32F101RD is not set */
 /* STM32F101RE is not set */
 /* STM32F101RF is not set */
 /* STM32F101RG is not set */
-/* STM32F101T8 is not set */
 /* STM32F101TB is not set */
-/* STM32F101V8 is not set */
 /* STM32F101VB is not set */
 /* STM32F101VC is not set */
 /* STM32F101VD is not set */
@ -190,15 +219,13 @@
 /* STM32F101ZE is not set */
 /* STM32F101ZF is not set */
 /* STM32F101ZG is not set */
-/* STM32F102C8 is not set */
 /* STM32F102CB is not set */
-/* STM32F102R8 is not set */
 /* STM32F102RB is not set */
 /* STM32F103C8 is not set */
 /* STM32F103CB is not set */
 /* STM32F103R8 is not set */
-#define STM32F103RB
-/* STM32F103RC is not set */
+/* STM32F103RB is not set */
+#define STM32F103RC
 /* STM32F103RD is not set */
 /* STM32F103RE is not set */
 /* STM32F103RF is not set */
@ -229,9 +256,9 @@
 /* STM32F107VC is not set */
 /* RT_USING_HSI is not set */
 #define RT_HSE_VALUE 8000000
-#define STM32F10X_PIN_NUMBERS 64
-/* RT_USING_UART1 is not set */
-#define RT_USING_UART2
+#define RT_USING_UART1
+/* RT_USING_UART2 is not set */
 /* RT_USING_UART3 is not set */
+/* RT_USING_SDCARD is not set */

 #endif