Merge remote-tracking branch 'upstream/master'

4 files changed, 7 insertions, 7 deletions

diff --git a/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f745xx.s b/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f745xx.s
index 04fc2d7f53..28b646b3cc 100644
--- a/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f745xx.s
+++ b/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f745xx.s
@@ -110,9 +110,9 @@ LoopFillZerobss:
 /* Call the clock system initialization function.*/
   bl  SystemInit   
 /* Call static constructors */
-    bl __libc_init_array
+/*    bl __libc_init_array */
 /* Call the application's entry point.*/
-  bl  main
+  bl  entry
   bx  lr    
 .size  Reset_Handler, .-Reset_Handler
 
diff --git a/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s b/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s
index 1e51e127fa..f38586036d 100644
--- a/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s
+++ b/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s
@@ -110,9 +110,9 @@ LoopFillZerobss:
 /* Call the clock system initialization function.*/
   bl  SystemInit   
 /* Call static constructors */
-    bl __libc_init_array
+/*    bl __libc_init_array */
 /* Call the application's entry point.*/
-  bl  main
+  bl  entry
   bx  lr    
 .size  Reset_Handler, .-Reset_Handler
 
diff --git a/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f756xx.s b/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f756xx.s
index 738be86959..2f5dc8982a 100644
--- a/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f756xx.s
+++ b/bsp/stm32f7-disco/Libraries/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f756xx.s
@@ -110,9 +110,9 @@ LoopFillZerobss:
 /* Call the clock system intitialization function.*/
   bl  SystemInit   
 /* Call static constructors */
-    bl __libc_init_array
+/*    bl __libc_init_array */
 /* Call the application's entry point.*/
-  bl  main
+  bl  entry
   bx  lr    
 .size  Reset_Handler, .-Reset_Handler
 
diff --git a/components/drivers/usb/usbhost/class/udisk.c b/components/drivers/usb/usbhost/class/udisk.c
index 6a4e02fa9c..f8f47890f4 100644
--- a/components/drivers/usb/usbhost/class/udisk.c
+++ b/components/drivers/usb/usbhost/class/udisk.c
@@ -306,9 +306,9 @@ rt_err_t rt_udisk_run(struct uhintf* intf)
             rt_memset(data, 0, sizeof(struct ustor_data));
             data->intf = intf;            
             data->udisk_id = udisk_get_id();
-            data->part.lock = rt_sem_create(sname, 1, RT_IPC_FLAG_FIFO);
             rt_snprintf(dname, 6, "ud%d-%d", data->udisk_id, i);
             rt_snprintf(sname, 8, "sem_ud%d",  i);
+            data->part.lock = rt_sem_create(sname, 1, RT_IPC_FLAG_FIFO);
 
             /* register sdcard device */
             stor->dev[i].type  = RT_Device_Class_Block;