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 04fc2d7f5375f7fcdb06739a6451604bb92b6ca9..28b646b3cc28eda3e7a80cc1b186d27efee6a960 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 1e51e127faab436c12e9d2185137df26319b18d4..f38586036d3f5901e23fc66ad5c71c5144e5f9e4 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 738be869599892821bfbae6238d6e154cf120f9f..2f5dc8982a447c3cd346c49b50461cbefec65c7f 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 6a4e02fa9cb6829619031392a6ad5a45f4a2c113..f8f47890f45bd4a8b0143365cc7ea6d8d44b13c9 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;