diff --git a/bsp/acm32f0x0-nucleo/libraries/Device/Startup_ACM32F0x0_gcc.s b/bsp/acm32f0x0-nucleo/libraries/Device/Startup_ACM32F0x0_gcc.s
index 2f9f931efb..6a103bdffe 100644
--- a/bsp/acm32f0x0-nucleo/libraries/Device/Startup_ACM32F0x0_gcc.s
+++ b/bsp/acm32f0x0-nucleo/libraries/Device/Startup_ACM32F0x0_gcc.s
@@ -79,8 +79,9 @@ LoopFillZerobss:
 /* Call the clock system intitialization function.*/
   /* bl  SystemInit */
 /* Call the application's entry point.*/
-  bl main
-  bx lr
+  bl entry
+LoopForever:
+    b LoopForever
 .size Reset_Handler, .-Reset_Handler
 
 /**
diff --git a/bsp/acm32f0x0-nucleo/libraries/SConscript b/bsp/acm32f0x0-nucleo/libraries/SConscript
index b25e899ddd..8f7a97ad30 100644
--- a/bsp/acm32f0x0-nucleo/libraries/SConscript
+++ b/bsp/acm32f0x0-nucleo/libraries/SConscript
@@ -12,7 +12,7 @@ HAL_Driver/Src/HAL_ADC.c
 HAL_Driver/Src/HAL_GPIO.c
 HAL_Driver/Src/HAL_WDT.c
 HAL_Driver/Src/HAL_IWDT.c
-HAL_Driver/Src/HAL_Uart.c
+HAL_Driver/Src/HAL_UART.c
 HAL_Driver/Src/HAL_TIMER.c
 HAL_Driver/Src/HAL_EXTI.c
 """)