Skip to content

Commit d841fef

Browse files
xeonxuNoe Xu
authored andcommitted
Revert "Fixed #1187 running issue while using firmware compiled by gcc."
This reverts commit 37660ac.
1 parent 3da9f71 commit d841fef

16 files changed

+54
-113
lines changed

bsp/stm32f10x-HAL/.config

Lines changed: 20 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ CONFIG_RT_USING_MEMHEAP=y
4040
CONFIG_RT_USING_SMALL_MEM=y
4141
# CONFIG_RT_USING_SLAB is not set
4242
# CONFIG_RT_USING_MEMHEAP_AS_HEAP is not set
43-
# CONFIG_RT_USING_MEMTRACE is not set
4443
CONFIG_RT_USING_HEAP=y
4544

4645
#
@@ -50,7 +49,7 @@ CONFIG_RT_USING_DEVICE=y
5049
# CONFIG_RT_USING_INTERRUPT_INFO is not set
5150
CONFIG_RT_USING_CONSOLE=y
5251
CONFIG_RT_CONSOLEBUF_SIZE=128
53-
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
52+
CONFIG_RT_CONSOLE_DEVICE_NAME="uart2"
5453
# CONFIG_RT_USING_MODULE is not set
5554

5655
#
@@ -68,9 +67,7 @@ CONFIG_RT_USING_USER_MAIN=y
6867
# Command shell
6968
#
7069
CONFIG_RT_USING_FINSH=y
71-
CONFIG_FINSH_THREAD_NAME="tshell"
7270
CONFIG_FINSH_USING_HISTORY=y
73-
CONFIG_FINSH_HISTORY_LINES=5
7471
CONFIG_FINSH_USING_SYMTAB=y
7572
CONFIG_FINSH_USING_DESCRIPTION=y
7673
CONFIG_FINSH_THREAD_PRIORITY=20
@@ -93,7 +90,6 @@ CONFIG_RT_USING_DEVICE_IPC=y
9390
CONFIG_RT_USING_SERIAL=y
9491
# CONFIG_RT_USING_CAN is not set
9592
# CONFIG_RT_USING_HWTIMER is not set
96-
# CONFIG_RT_USING_CPUTIME is not set
9793
# CONFIG_RT_USING_I2C is not set
9894
CONFIG_RT_USING_PIN=y
9995
# CONFIG_RT_USING_MTD_NOR is not set
@@ -102,7 +98,6 @@ CONFIG_RT_USING_PIN=y
10298
# CONFIG_RT_USING_SDIO is not set
10399
# CONFIG_RT_USING_SPI is not set
104100
# CONFIG_RT_USING_WDT is not set
105-
# CONFIG_RT_USING_WIFI is not set
106101

107102
#
108103
# Using USB
@@ -113,7 +108,7 @@ CONFIG_RT_USING_PIN=y
113108
#
114109
# POSIX layer and C standard library
115110
#
116-
CONFIG_RT_USING_LIBC=y
111+
# CONFIG_RT_USING_LIBC is not set
117112
# CONFIG_RT_USING_PTHREADS is not set
118113

119114
#
@@ -140,12 +135,6 @@ CONFIG_RT_USING_LIBC=y
140135
#
141136
# CONFIG_RT_USING_VBUS is not set
142137

143-
#
144-
# Utilities
145-
#
146-
# CONFIG_RT_USING_LOGTRACE is not set
147-
# CONFIG_RT_USING_RYM is not set
148-
149138
#
150139
# RT-Thread online packages
151140
#
@@ -155,90 +144,67 @@ CONFIG_RT_USING_LIBC=y
155144
#
156145
# CONFIG_PKG_USING_PARTITION is not set
157146
# CONFIG_PKG_USING_SQLITE is not set
158-
# CONFIG_PKG_USING_RTI is not set
159147

160148
#
161149
# IoT - internet of things
162150
#
151+
# CONFIG_PKG_USING_CJSON is not set
163152
# CONFIG_PKG_USING_PAHOMQTT is not set
164153
# CONFIG_PKG_USING_WEBCLIENT is not set
165154
# CONFIG_PKG_USING_MONGOOSE is not set
166155
# CONFIG_PKG_USING_WEBTERMINAL is not set
167-
# CONFIG_PKG_USING_CJSON is not set
168-
# CONFIG_PKG_USING_LJSON is not set
169-
# CONFIG_PKG_USING_EZXML is not set
170-
# CONFIG_PKG_USING_NANOPB is not set
171-
# CONFIG_PKG_USING_GAGENT_CLOUD is not set
172-
173-
#
174-
# Wi-Fi
175-
#
176-
177-
#
178-
# Marvell WiFi
179-
#
180-
# CONFIG_PKG_USING_WLANMARVELL is not set
181-
182-
#
183-
# Wiced WiFi
184-
#
185-
# CONFIG_PKG_USING_WLAN_WICED is not set
186-
# CONFIG_PKG_USING_COAP is not set
187-
# CONFIG_PKG_USING_NOPOLL is not set
188156

189157
#
190158
# security packages
191159
#
192160
# CONFIG_PKG_USING_MBEDTLS is not set
193-
# CONFIG_PKG_USING_libsodium is not set
194-
# CONFIG_PKG_USING_TINYCRYPT is not set
195161

196162
#
197163
# language packages
198164
#
199165
# CONFIG_PKG_USING_JERRYSCRIPT is not set
200-
# CONFIG_PKG_USING_MICROPYTHON is not set
201166

202167
#
203168
# multimedia packages
204169
#
205-
# CONFIG_PKG_USING_OPENMV is not set
206170

207171
#
208172
# tools packages
209173
#
210174
# CONFIG_PKG_USING_CMBACKTRACE is not set
211175
# CONFIG_PKG_USING_EASYLOGGER is not set
212-
# CONFIG_PKG_USING_SYSTEMVIEW is not set
213-
# CONFIG_PKG_USING_IPERF is not set
214176

215177
#
216178
# miscellaneous packages
217179
#
218-
# CONFIG_PKG_USING_FASTLZ is not set
219-
# CONFIG_PKG_USING_MINILZO is not set
220-
221-
#
222-
# example package: hello
223-
#
224180
# CONFIG_PKG_USING_HELLO is not set
181+
# CONFIG_STM32F100C8 is not set
182+
# CONFIG_STM32F100CB is not set
183+
# CONFIG_STM32F100R8 is not set
184+
# CONFIG_STM32F100RB is not set
225185
# CONFIG_STM32F100RC is not set
226186
# CONFIG_STM32F100RD is not set
227187
# CONFIG_STM32F100RE is not set
188+
# CONFIG_STM32F100V8 is not set
189+
# CONFIG_STM32F100VB is not set
228190
# CONFIG_STM32F100VC is not set
229191
# CONFIG_STM32F100VD is not set
230192
# CONFIG_STM32F100VE is not set
231193
# CONFIG_STM32F100ZC is not set
232194
# CONFIG_STM32F100ZD is not set
233195
# CONFIG_STM32F100ZE is not set
196+
# CONFIG_STM32F101C8 is not set
234197
# CONFIG_STM32F101CB is not set
198+
# CONFIG_STM32F101R8 is not set
235199
# CONFIG_STM32F101RB is not set
236200
# CONFIG_STM32F101RC is not set
237201
# CONFIG_STM32F101RD is not set
238202
# CONFIG_STM32F101RE is not set
239203
# CONFIG_STM32F101RF is not set
240204
# CONFIG_STM32F101RG is not set
205+
# CONFIG_STM32F101T8 is not set
241206
# CONFIG_STM32F101TB is not set
207+
# CONFIG_STM32F101V8 is not set
242208
# CONFIG_STM32F101VB is not set
243209
# CONFIG_STM32F101VC is not set
244210
# CONFIG_STM32F101VD is not set
@@ -250,13 +216,15 @@ CONFIG_RT_USING_LIBC=y
250216
# CONFIG_STM32F101ZE is not set
251217
# CONFIG_STM32F101ZF is not set
252218
# CONFIG_STM32F101ZG is not set
219+
# CONFIG_STM32F102C8 is not set
253220
# CONFIG_STM32F102CB is not set
221+
# CONFIG_STM32F102R8 is not set
254222
# CONFIG_STM32F102RB is not set
255223
# CONFIG_STM32F103C8 is not set
256224
# CONFIG_STM32F103CB is not set
257225
# CONFIG_STM32F103R8 is not set
258-
# CONFIG_STM32F103RB is not set
259-
CONFIG_STM32F103RC=y
226+
CONFIG_STM32F103RB=y
227+
# CONFIG_STM32F103RC is not set
260228
# CONFIG_STM32F103RD is not set
261229
# CONFIG_STM32F103RE is not set
262230
# CONFIG_STM32F103RF is not set
@@ -287,7 +255,7 @@ CONFIG_STM32F103RC=y
287255
# CONFIG_STM32F107VC is not set
288256
# CONFIG_RT_USING_HSI is not set
289257
CONFIG_RT_HSE_VALUE=8000000
290-
CONFIG_RT_USING_UART1=y
291-
# CONFIG_RT_USING_UART2 is not set
258+
CONFIG_STM32F10X_PIN_NUMBERS=64
259+
# CONFIG_RT_USING_UART1 is not set
260+
CONFIG_RT_USING_UART2=y
292261
# CONFIG_RT_USING_UART3 is not set
293-
# CONFIG_RT_USING_SDCARD is not set

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f100xb.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f100xe.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101x6.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xb.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xe.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f101xg.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f102x6.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f102xb.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

bsp/stm32f10x-HAL/Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103x6.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LoopFillZerobss:
111111
/* Call static constructors */
112112
bl __libc_init_array
113113
/* Call the application's entry point.*/
114-
bl entry
114+
bl main
115115
bx lr
116116
.size Reset_Handler, .-Reset_Handler
117117

0 commit comments

Comments
 (0)