From c51b11f103d7986bdeb277d8e7613b6a6b85364b Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Wed, 27 Feb 2019 09:15:07 -0500 Subject: [PATCH] Move all paths using "stm" to "st" subdirectories, update config.mk. --- hw/bsp/stm32f407g_disc1/board.mk | 10 +++++----- .../stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.pdf | Bin .../stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.rtf | 0 .../Device/ST/STM32F4xx/Include/.stm32f407xx.h.swp | Bin .../Device/ST/STM32F4xx/Include/stm32f401xc.h | 0 .../Device/ST/STM32F4xx/Include/stm32f401xe.h | 0 .../Device/ST/STM32F4xx/Include/stm32f405xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f407xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f410cx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f410rx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f410tx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f411xe.h | 0 .../Device/ST/STM32F4xx/Include/stm32f412cx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f412rx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f412vx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f412zx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f413xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f415xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f417xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f423xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f427xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f429xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f437xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f439xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f446xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f469xx.h | 0 .../Device/ST/STM32F4xx/Include/stm32f479xx.h | 0 .../stm32f4/Device/ST/STM32F4xx/Include/stm32f4xx.h | 0 .../Device/ST/STM32F4xx/Include/system_stm32f4xx.h | 0 .../stm32f4/Device/ST/STM32F4xx/Release_Notes.html | 0 .../Source/Templates/arm/startup_stm32f401xc.s | 0 .../Source/Templates/arm/startup_stm32f401xe.s | 0 .../Source/Templates/arm/startup_stm32f405xx.s | 0 .../Source/Templates/arm/startup_stm32f407xx.s | 0 .../Source/Templates/arm/startup_stm32f410cx.s | 0 .../Source/Templates/arm/startup_stm32f410rx.s | 0 .../Source/Templates/arm/startup_stm32f410tx.s | 0 .../Source/Templates/arm/startup_stm32f411xe.s | 0 .../Source/Templates/arm/startup_stm32f412cx.s | 0 .../Source/Templates/arm/startup_stm32f412rx.s | 0 .../Source/Templates/arm/startup_stm32f412vx.s | 0 .../Source/Templates/arm/startup_stm32f412zx.s | 0 .../Source/Templates/arm/startup_stm32f413xx.s | 0 .../Source/Templates/arm/startup_stm32f415xx.s | 0 .../Source/Templates/arm/startup_stm32f417xx.s | 0 .../Source/Templates/arm/startup_stm32f423xx.s | 0 .../Source/Templates/arm/startup_stm32f427xx.s | 0 .../Source/Templates/arm/startup_stm32f429xx.s | 0 .../Source/Templates/arm/startup_stm32f437xx.s | 0 .../Source/Templates/arm/startup_stm32f439xx.s | 0 .../Source/Templates/arm/startup_stm32f446xx.s | 0 .../Source/Templates/arm/startup_stm32f469xx.s | 0 .../Source/Templates/arm/startup_stm32f479xx.s | 0 .../Source/Templates/gcc/startup_stm32f401xc.s | 0 .../Source/Templates/gcc/startup_stm32f401xe.s | 0 .../Source/Templates/gcc/startup_stm32f405xx.s | 0 .../Source/Templates/gcc/startup_stm32f407xx.s | 0 .../Source/Templates/gcc/startup_stm32f410cx.s | 0 .../Source/Templates/gcc/startup_stm32f410rx.s | 0 .../Source/Templates/gcc/startup_stm32f410tx.s | 0 .../Source/Templates/gcc/startup_stm32f411xe.s | 0 .../Source/Templates/gcc/startup_stm32f412cx.s | 0 .../Source/Templates/gcc/startup_stm32f412rx.s | 0 .../Source/Templates/gcc/startup_stm32f412vx.s | 0 .../Source/Templates/gcc/startup_stm32f412zx.s | 0 .../Source/Templates/gcc/startup_stm32f413xx.s | 0 .../Source/Templates/gcc/startup_stm32f415xx.s | 0 .../Source/Templates/gcc/startup_stm32f417xx.s | 0 .../Source/Templates/gcc/startup_stm32f423xx.s | 0 .../Source/Templates/gcc/startup_stm32f427xx.s | 0 .../Source/Templates/gcc/startup_stm32f429xx.s | 0 .../Source/Templates/gcc/startup_stm32f437xx.s | 0 .../Source/Templates/gcc/startup_stm32f439xx.s | 0 .../Source/Templates/gcc/startup_stm32f446xx.s | 0 .../Source/Templates/gcc/startup_stm32f469xx.s | 0 .../Source/Templates/gcc/startup_stm32f479xx.s | 0 .../Templates/iar/linker/stm32f401xc_flash.icf | 0 .../Templates/iar/linker/stm32f401xc_sram.icf | 0 .../Templates/iar/linker/stm32f401xe_flash.icf | 0 .../Templates/iar/linker/stm32f401xe_sram.icf | 0 .../Templates/iar/linker/stm32f405xx_flash.icf | 0 .../Templates/iar/linker/stm32f405xx_sram.icf | 0 .../Templates/iar/linker/stm32f407xx_flash.icf | 0 .../Templates/iar/linker/stm32f407xx_sram.icf | 0 .../Templates/iar/linker/stm32f410cx_flash.icf | 0 .../Templates/iar/linker/stm32f410cx_sram.icf | 0 .../Templates/iar/linker/stm32f410rx_flash.icf | 0 .../Templates/iar/linker/stm32f410rx_sram.icf | 0 .../Templates/iar/linker/stm32f410tx_flash.icf | 0 .../Templates/iar/linker/stm32f410tx_sram.icf | 0 .../Templates/iar/linker/stm32f411xe_flash.icf | 0 .../Templates/iar/linker/stm32f411xe_sram.icf | 0 .../Templates/iar/linker/stm32f412cx_flash.icf | 0 .../Templates/iar/linker/stm32f412cx_sram.icf | 0 .../Templates/iar/linker/stm32f412rx_flash.icf | 0 .../Templates/iar/linker/stm32f412rx_sram.icf | 0 .../Templates/iar/linker/stm32f412vx_flash.icf | 0 .../Templates/iar/linker/stm32f412vx_sram.icf | 0 .../Templates/iar/linker/stm32f412zx_flash.icf | 0 .../Templates/iar/linker/stm32f412zx_sram.icf | 0 .../Templates/iar/linker/stm32f413xx_flash.icf | 0 .../Templates/iar/linker/stm32f413xx_sram.icf | 0 .../Templates/iar/linker/stm32f415xx_flash.icf | 0 .../Templates/iar/linker/stm32f415xx_sram.icf | 0 .../Templates/iar/linker/stm32f417xx_flash.icf | 0 .../Templates/iar/linker/stm32f417xx_sram.icf | 0 .../Templates/iar/linker/stm32f423xx_flash.icf | 0 .../Templates/iar/linker/stm32f423xx_sram.icf | 0 .../Templates/iar/linker/stm32f427xx_flash.icf | 0 .../Templates/iar/linker/stm32f427xx_sram.icf | 0 .../Templates/iar/linker/stm32f429xx_flash.icf | 0 .../Templates/iar/linker/stm32f429xx_sram.icf | 0 .../Templates/iar/linker/stm32f437xx_flash.icf | 0 .../Templates/iar/linker/stm32f437xx_sram.icf | 0 .../Templates/iar/linker/stm32f439xx_flash.icf | 0 .../Templates/iar/linker/stm32f439xx_sram.icf | 0 .../Templates/iar/linker/stm32f446xx_flash.icf | 0 .../Templates/iar/linker/stm32f446xx_sram.icf | 0 .../Templates/iar/linker/stm32f469xx_flash.icf | 0 .../Templates/iar/linker/stm32f469xx_sram.icf | 0 .../Templates/iar/linker/stm32f479xx_flash.icf | 0 .../Templates/iar/linker/stm32f479xx_sram.icf | 0 .../Source/Templates/iar/startup_stm32f401xc.s | 0 .../Source/Templates/iar/startup_stm32f401xe.s | 0 .../Source/Templates/iar/startup_stm32f405xx.s | 0 .../Source/Templates/iar/startup_stm32f407xx.s | 0 .../Source/Templates/iar/startup_stm32f410cx.s | 0 .../Source/Templates/iar/startup_stm32f410rx.s | 0 .../Source/Templates/iar/startup_stm32f410tx.s | 0 .../Source/Templates/iar/startup_stm32f411xe.s | 0 .../Source/Templates/iar/startup_stm32f412cx.s | 0 .../Source/Templates/iar/startup_stm32f412rx.s | 0 .../Source/Templates/iar/startup_stm32f412vx.s | 0 .../Source/Templates/iar/startup_stm32f412zx.s | 0 .../Source/Templates/iar/startup_stm32f413xx.s | 0 .../Source/Templates/iar/startup_stm32f415xx.s | 0 .../Source/Templates/iar/startup_stm32f417xx.s | 0 .../Source/Templates/iar/startup_stm32f423xx.s | 0 .../Source/Templates/iar/startup_stm32f427xx.s | 0 .../Source/Templates/iar/startup_stm32f429xx.s | 0 .../Source/Templates/iar/startup_stm32f437xx.s | 0 .../Source/Templates/iar/startup_stm32f439xx.s | 0 .../Source/Templates/iar/startup_stm32f446xx.s | 0 .../Source/Templates/iar/startup_stm32f469xx.s | 0 .../Source/Templates/iar/startup_stm32f479xx.s | 0 .../STM32F4xx/Source/Templates/system_stm32f4xx.c | 0 hw/mcu/{stm => st}/stm32f4/Documentation/index.html | 0 .../{stm => st}/stm32f4/Include/arm_common_tables.h | 0 .../{stm => st}/stm32f4/Include/arm_const_structs.h | 0 hw/mcu/{stm => st}/stm32f4/Include/arm_math.h | 0 hw/mcu/{stm => st}/stm32f4/Include/cmsis_armcc.h | 0 hw/mcu/{stm => st}/stm32f4/Include/cmsis_armcc_V6.h | 0 hw/mcu/{stm => st}/stm32f4/Include/cmsis_gcc.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cm0.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cm0plus.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cm3.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cm4.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cm7.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cmFunc.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cmInstr.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_cmSimd.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_sc000.h | 0 hw/mcu/{stm => st}/stm32f4/Include/core_sc300.h | 0 .../stm32f4/Lib/ARM/arm_cortexM4b_math.lib | Bin .../stm32f4/Lib/ARM/arm_cortexM4bf_math.lib | Bin .../stm32f4/Lib/ARM/arm_cortexM4l_math.lib | Bin .../stm32f4/Lib/ARM/arm_cortexM4lf_math.lib | Bin .../stm32f4/Lib/GCC/libarm_cortexM4l_math.a | Bin .../stm32f4/Lib/GCC/libarm_cortexM4lf_math.a | Bin hw/mcu/{stm => st}/stm32f4/Lib/license.txt | 0 hw/mcu/{stm => st}/stm32f4/RTOS/Template/cmsis_os.h | 0 hw/mcu/{stm => st}/stm32f4/index.html | 0 src/portable/{stm => st}/stm32f4/dcd_stm32f4.c | 0 src/portable/{stm => st}/stm32f4/hal_stm32f4.c | 0 174 files changed, 5 insertions(+), 5 deletions(-) rename hw/mcu/{stm => st}/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.pdf (100%) rename hw/mcu/{stm => st}/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.rtf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/.stm32f407xx.h.swp (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xc.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xe.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f405xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f407xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f410cx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f410rx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f410tx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f411xe.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f412cx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f412rx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f412vx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f412zx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f413xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f415xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f417xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f423xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f427xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f429xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f437xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f439xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f446xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f469xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f479xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/stm32f4xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Include/system_stm32f4xx.h (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Release_Notes.html (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s (100%) rename hw/mcu/{stm => st}/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c (100%) rename hw/mcu/{stm => st}/stm32f4/Documentation/index.html (100%) rename hw/mcu/{stm => st}/stm32f4/Include/arm_common_tables.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/arm_const_structs.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/arm_math.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/cmsis_armcc.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/cmsis_armcc_V6.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/cmsis_gcc.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cm0.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cm0plus.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cm3.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cm4.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cm7.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cmFunc.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cmInstr.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_cmSimd.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_sc000.h (100%) rename hw/mcu/{stm => st}/stm32f4/Include/core_sc300.h (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/ARM/arm_cortexM4b_math.lib (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/ARM/arm_cortexM4bf_math.lib (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/ARM/arm_cortexM4l_math.lib (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/ARM/arm_cortexM4lf_math.lib (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/GCC/libarm_cortexM4l_math.a (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/GCC/libarm_cortexM4lf_math.a (100%) rename hw/mcu/{stm => st}/stm32f4/Lib/license.txt (100%) rename hw/mcu/{stm => st}/stm32f4/RTOS/Template/cmsis_os.h (100%) rename hw/mcu/{stm => st}/stm32f4/index.html (100%) rename src/portable/{stm => st}/stm32f4/dcd_stm32f4.c (100%) rename src/portable/{stm => st}/stm32f4/hal_stm32f4.c (100%) diff --git a/hw/bsp/stm32f407g_disc1/board.mk b/hw/bsp/stm32f407g_disc1/board.mk index 24efea1ac..c4c765020 100644 --- a/hw/bsp/stm32f407g_disc1/board.mk +++ b/hw/bsp/stm32f407g_disc1/board.mk @@ -14,14 +14,14 @@ LD_FILE = hw/bsp/stm32f407g_disc1/STM32F407VGTx_FLASH.ld LDFLAGS += -mthumb -mcpu=cortex-m4 SRC_C += \ - hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c + hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c SRC_S += \ - hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s + hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s INC += \ - -I$(TOP)/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include \ - -I$(TOP)/hw/mcu/stm/stm32f4/Include + -I$(TOP)/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include \ + -I$(TOP)/hw/mcu/st/stm32f4/Include -VENDOR = stm +VENDOR = st CHIP_FAMILY = stm32f4 diff --git a/hw/mcu/stm/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.pdf b/hw/mcu/st/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.pdf similarity index 100% rename from hw/mcu/stm/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.pdf rename to hw/mcu/st/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.pdf diff --git a/hw/mcu/stm/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.rtf b/hw/mcu/st/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.rtf similarity index 100% rename from hw/mcu/stm/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.rtf rename to hw/mcu/st/stm32f4/CMSIS_END_USER_LICENCE_AGREEMENT.rtf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/.stm32f407xx.h.swp b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/.stm32f407xx.h.swp similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/.stm32f407xx.h.swp rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/.stm32f407xx.h.swp diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xc.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xc.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xc.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xc.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xe.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xe.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xe.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f401xe.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f405xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f405xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f405xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f405xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f407xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f407xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f407xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f407xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f410cx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f410cx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f410cx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f410cx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f410rx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f410rx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f410rx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f410rx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f410tx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f410tx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f410tx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f410tx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f411xe.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f411xe.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f411xe.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f411xe.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412cx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412cx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412cx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412cx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412rx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412rx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412rx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412rx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412vx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412vx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412vx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412vx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412zx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412zx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f412zx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f412zx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f413xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f413xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f413xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f413xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f415xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f415xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f415xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f415xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f417xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f417xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f417xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f417xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f423xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f423xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f423xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f423xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f427xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f427xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f427xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f427xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f429xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f429xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f429xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f429xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f437xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f437xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f437xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f437xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f439xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f439xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f439xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f439xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f446xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f446xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f446xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f446xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f469xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f469xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f469xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f469xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f479xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f479xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f479xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f479xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f4xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f4xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/stm32f4xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/stm32f4xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/system_stm32f4xx.h b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/system_stm32f4xx.h similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Include/system_stm32f4xx.h rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Include/system_stm32f4xx.h diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Release_Notes.html b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Release_Notes.html similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Release_Notes.html rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Release_Notes.html diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xc.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410cx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410tx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412cx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412rx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412vx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f415xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f417xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f423xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f437xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f439xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f479xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xc.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410cx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410tx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412cx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412rx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412vx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f415xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f417xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f423xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f437xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f439xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f479xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xc_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f401xe_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f405xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f407xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410cx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410rx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f410tx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f411xe_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412cx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412rx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412vx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f412zx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f413xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f415xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f417xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f423xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f427xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f429xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f437xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f439xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f446xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f469xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_flash.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/linker/stm32f479xx_sram.icf diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xc.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410cx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410tx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412cx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412rx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412vx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f415xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f417xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f423xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f437xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f439xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f479xx.s diff --git a/hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c b/hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c similarity index 100% rename from hw/mcu/stm/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c rename to hw/mcu/st/stm32f4/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c diff --git a/hw/mcu/stm/stm32f4/Documentation/index.html b/hw/mcu/st/stm32f4/Documentation/index.html similarity index 100% rename from hw/mcu/stm/stm32f4/Documentation/index.html rename to hw/mcu/st/stm32f4/Documentation/index.html diff --git a/hw/mcu/stm/stm32f4/Include/arm_common_tables.h b/hw/mcu/st/stm32f4/Include/arm_common_tables.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/arm_common_tables.h rename to hw/mcu/st/stm32f4/Include/arm_common_tables.h diff --git a/hw/mcu/stm/stm32f4/Include/arm_const_structs.h b/hw/mcu/st/stm32f4/Include/arm_const_structs.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/arm_const_structs.h rename to hw/mcu/st/stm32f4/Include/arm_const_structs.h diff --git a/hw/mcu/stm/stm32f4/Include/arm_math.h b/hw/mcu/st/stm32f4/Include/arm_math.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/arm_math.h rename to hw/mcu/st/stm32f4/Include/arm_math.h diff --git a/hw/mcu/stm/stm32f4/Include/cmsis_armcc.h b/hw/mcu/st/stm32f4/Include/cmsis_armcc.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/cmsis_armcc.h rename to hw/mcu/st/stm32f4/Include/cmsis_armcc.h diff --git a/hw/mcu/stm/stm32f4/Include/cmsis_armcc_V6.h b/hw/mcu/st/stm32f4/Include/cmsis_armcc_V6.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/cmsis_armcc_V6.h rename to hw/mcu/st/stm32f4/Include/cmsis_armcc_V6.h diff --git a/hw/mcu/stm/stm32f4/Include/cmsis_gcc.h b/hw/mcu/st/stm32f4/Include/cmsis_gcc.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/cmsis_gcc.h rename to hw/mcu/st/stm32f4/Include/cmsis_gcc.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cm0.h b/hw/mcu/st/stm32f4/Include/core_cm0.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cm0.h rename to hw/mcu/st/stm32f4/Include/core_cm0.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cm0plus.h b/hw/mcu/st/stm32f4/Include/core_cm0plus.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cm0plus.h rename to hw/mcu/st/stm32f4/Include/core_cm0plus.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cm3.h b/hw/mcu/st/stm32f4/Include/core_cm3.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cm3.h rename to hw/mcu/st/stm32f4/Include/core_cm3.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cm4.h b/hw/mcu/st/stm32f4/Include/core_cm4.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cm4.h rename to hw/mcu/st/stm32f4/Include/core_cm4.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cm7.h b/hw/mcu/st/stm32f4/Include/core_cm7.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cm7.h rename to hw/mcu/st/stm32f4/Include/core_cm7.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cmFunc.h b/hw/mcu/st/stm32f4/Include/core_cmFunc.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cmFunc.h rename to hw/mcu/st/stm32f4/Include/core_cmFunc.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cmInstr.h b/hw/mcu/st/stm32f4/Include/core_cmInstr.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cmInstr.h rename to hw/mcu/st/stm32f4/Include/core_cmInstr.h diff --git a/hw/mcu/stm/stm32f4/Include/core_cmSimd.h b/hw/mcu/st/stm32f4/Include/core_cmSimd.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_cmSimd.h rename to hw/mcu/st/stm32f4/Include/core_cmSimd.h diff --git a/hw/mcu/stm/stm32f4/Include/core_sc000.h b/hw/mcu/st/stm32f4/Include/core_sc000.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_sc000.h rename to hw/mcu/st/stm32f4/Include/core_sc000.h diff --git a/hw/mcu/stm/stm32f4/Include/core_sc300.h b/hw/mcu/st/stm32f4/Include/core_sc300.h similarity index 100% rename from hw/mcu/stm/stm32f4/Include/core_sc300.h rename to hw/mcu/st/stm32f4/Include/core_sc300.h diff --git a/hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4b_math.lib b/hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4b_math.lib similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4b_math.lib rename to hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4b_math.lib diff --git a/hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4bf_math.lib b/hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4bf_math.lib similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4bf_math.lib rename to hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4bf_math.lib diff --git a/hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4l_math.lib b/hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4l_math.lib similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4l_math.lib rename to hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4l_math.lib diff --git a/hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4lf_math.lib b/hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4lf_math.lib similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/ARM/arm_cortexM4lf_math.lib rename to hw/mcu/st/stm32f4/Lib/ARM/arm_cortexM4lf_math.lib diff --git a/hw/mcu/stm/stm32f4/Lib/GCC/libarm_cortexM4l_math.a b/hw/mcu/st/stm32f4/Lib/GCC/libarm_cortexM4l_math.a similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/GCC/libarm_cortexM4l_math.a rename to hw/mcu/st/stm32f4/Lib/GCC/libarm_cortexM4l_math.a diff --git a/hw/mcu/stm/stm32f4/Lib/GCC/libarm_cortexM4lf_math.a b/hw/mcu/st/stm32f4/Lib/GCC/libarm_cortexM4lf_math.a similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/GCC/libarm_cortexM4lf_math.a rename to hw/mcu/st/stm32f4/Lib/GCC/libarm_cortexM4lf_math.a diff --git a/hw/mcu/stm/stm32f4/Lib/license.txt b/hw/mcu/st/stm32f4/Lib/license.txt similarity index 100% rename from hw/mcu/stm/stm32f4/Lib/license.txt rename to hw/mcu/st/stm32f4/Lib/license.txt diff --git a/hw/mcu/stm/stm32f4/RTOS/Template/cmsis_os.h b/hw/mcu/st/stm32f4/RTOS/Template/cmsis_os.h similarity index 100% rename from hw/mcu/stm/stm32f4/RTOS/Template/cmsis_os.h rename to hw/mcu/st/stm32f4/RTOS/Template/cmsis_os.h diff --git a/hw/mcu/stm/stm32f4/index.html b/hw/mcu/st/stm32f4/index.html similarity index 100% rename from hw/mcu/stm/stm32f4/index.html rename to hw/mcu/st/stm32f4/index.html diff --git a/src/portable/stm/stm32f4/dcd_stm32f4.c b/src/portable/st/stm32f4/dcd_stm32f4.c similarity index 100% rename from src/portable/stm/stm32f4/dcd_stm32f4.c rename to src/portable/st/stm32f4/dcd_stm32f4.c diff --git a/src/portable/stm/stm32f4/hal_stm32f4.c b/src/portable/st/stm32f4/hal_stm32f4.c similarity index 100% rename from src/portable/stm/stm32f4/hal_stm32f4.c rename to src/portable/st/stm32f4/hal_stm32f4.c