diff --git a/hw/bsp/stm32f072disco/STM32F072RBTx_FLASH.ld b/hw/bsp/stm32f0/boards/stm32f072disco/STM32F072RBTx_FLASH.ld
similarity index 100%
rename from hw/bsp/stm32f072disco/STM32F072RBTx_FLASH.ld
rename to hw/bsp/stm32f0/boards/stm32f072disco/STM32F072RBTx_FLASH.ld
diff --git a/hw/bsp/stm32f072disco/stm32f072disco.c b/hw/bsp/stm32f0/family.c
similarity index 100%
rename from hw/bsp/stm32f072disco/stm32f072disco.c
rename to hw/bsp/stm32f0/family.c
diff --git a/hw/bsp/stm32f072disco/board.mk b/hw/bsp/stm32f0/family.mk
similarity index 75%
rename from hw/bsp/stm32f072disco/board.mk
rename to hw/bsp/stm32f0/family.mk
index 071c42b65..08cbf5626 100644
--- a/hw/bsp/stm32f072disco/board.mk
+++ b/hw/bsp/stm32f0/family.mk
@@ -1,9 +1,12 @@
+UF2_FAMILY_ID = 0x647824b6
 ST_FAMILY = f0
 DEPS_SUBMODULES += lib/CMSIS_5 hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
+include $(TOP)/$(BOARD_PATH)/board.mk
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -11,16 +14,12 @@ CFLAGS += \
   -mcpu=cortex-m0 \
   -mfloat-abi=soft \
   -nostdlib -nostartfiles \
-  -DSTM32F072xB \
   -DCFG_EXAMPLE_MSC_READONLY \
   -DCFG_TUSB_MCU=OPT_MCU_STM32F0
 
 # suppress warning caused by vendor mcu driver
 CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
 
-# All source paths should be relative to the top level.
-LD_FILE = hw/bsp/$(BOARD)/STM32F072RBTx_FLASH.ld
-
 SRC_C += \
   src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c \
   $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \
@@ -31,20 +30,11 @@ SRC_C += \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c \
   $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_uart.c
 
-SRC_S += \
-  $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f072xb.s
-
 INC += \
+	$(TOP)/$(BOARD_PATH) \
   $(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
   $(TOP)/$(ST_CMSIS)/Include \
-  $(TOP)/$(ST_HAL_DRIVER)/Inc \
-  $(TOP)/hw/bsp/$(BOARD)
+  $(TOP)/$(ST_HAL_DRIVER)/Inc
 
 # For freeRTOS port source
 FREERTOS_PORT = ARM_CM0
-
-# For flash-jlink target
-JLINK_DEVICE = stm32f072rb
-
-# flash target using on-board stlink
-flash: flash-stlink
diff --git a/hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h b/hw/bsp/stm32f0/stm32f0xx_hal_conf.h
similarity index 100%
rename from hw/bsp/stm32f072disco/stm32f0xx_hal_conf.h
rename to hw/bsp/stm32f0/stm32f0xx_hal_conf.h