diff --git a/core/embed/drv/linker/stm32f4/boardloader.ld b/core/embed/drv/bsp/linker/stm32f4/boardloader.ld
similarity index 100%
rename from core/embed/drv/linker/stm32f4/boardloader.ld
rename to core/embed/drv/bsp/linker/stm32f4/boardloader.ld
diff --git a/core/embed/drv/linker/stm32f4/bootloader.ld b/core/embed/drv/bsp/linker/stm32f4/bootloader.ld
similarity index 100%
rename from core/embed/drv/linker/stm32f4/bootloader.ld
rename to core/embed/drv/bsp/linker/stm32f4/bootloader.ld
diff --git a/core/embed/drv/linker/stm32f4/firmware.ld b/core/embed/drv/bsp/linker/stm32f4/firmware.ld
similarity index 100%
rename from core/embed/drv/linker/stm32f4/firmware.ld
rename to core/embed/drv/bsp/linker/stm32f4/firmware.ld
diff --git a/core/embed/drv/linker/stm32f4/kernel.ld b/core/embed/drv/bsp/linker/stm32f4/kernel.ld
similarity index 100%
rename from core/embed/drv/linker/stm32f4/kernel.ld
rename to core/embed/drv/bsp/linker/stm32f4/kernel.ld
diff --git a/core/embed/drv/linker/stm32f4/memory.ld b/core/embed/drv/bsp/linker/stm32f4/memory.ld
similarity index 100%
rename from core/embed/drv/linker/stm32f4/memory.ld
rename to core/embed/drv/bsp/linker/stm32f4/memory.ld
diff --git a/core/embed/drv/linker/stm32f4/prodtest.ld b/core/embed/drv/bsp/linker/stm32f4/prodtest.ld
similarity index 100%
rename from core/embed/drv/linker/stm32f4/prodtest.ld
rename to core/embed/drv/bsp/linker/stm32f4/prodtest.ld
diff --git a/core/embed/drv/linker/stm32u58/boardloader.ld b/core/embed/drv/bsp/linker/stm32u58/boardloader.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u58/boardloader.ld
rename to core/embed/drv/bsp/linker/stm32u58/boardloader.ld
diff --git a/core/embed/drv/linker/stm32u58/bootloader.ld b/core/embed/drv/bsp/linker/stm32u58/bootloader.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u58/bootloader.ld
rename to core/embed/drv/bsp/linker/stm32u58/bootloader.ld
diff --git a/core/embed/drv/linker/stm32u58/firmware.ld b/core/embed/drv/bsp/linker/stm32u58/firmware.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u58/firmware.ld
rename to core/embed/drv/bsp/linker/stm32u58/firmware.ld
diff --git a/core/embed/drv/linker/stm32u58/kernel.ld b/core/embed/drv/bsp/linker/stm32u58/kernel.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u58/kernel.ld
rename to core/embed/drv/bsp/linker/stm32u58/kernel.ld
diff --git a/core/embed/drv/linker/stm32u58/memory.ld b/core/embed/drv/bsp/linker/stm32u58/memory.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u58/memory.ld
rename to core/embed/drv/bsp/linker/stm32u58/memory.ld
diff --git a/core/embed/drv/linker/stm32u58/prodtest.ld b/core/embed/drv/bsp/linker/stm32u58/prodtest.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u58/prodtest.ld
rename to core/embed/drv/bsp/linker/stm32u58/prodtest.ld
diff --git a/core/embed/drv/linker/stm32u5a/boardloader.ld b/core/embed/drv/bsp/linker/stm32u5a/boardloader.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u5a/boardloader.ld
rename to core/embed/drv/bsp/linker/stm32u5a/boardloader.ld
diff --git a/core/embed/drv/linker/stm32u5a/bootloader.ld b/core/embed/drv/bsp/linker/stm32u5a/bootloader.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u5a/bootloader.ld
rename to core/embed/drv/bsp/linker/stm32u5a/bootloader.ld
diff --git a/core/embed/drv/linker/stm32u5a/firmware.ld b/core/embed/drv/bsp/linker/stm32u5a/firmware.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u5a/firmware.ld
rename to core/embed/drv/bsp/linker/stm32u5a/firmware.ld
diff --git a/core/embed/drv/linker/stm32u5a/kernel.ld b/core/embed/drv/bsp/linker/stm32u5a/kernel.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u5a/kernel.ld
rename to core/embed/drv/bsp/linker/stm32u5a/kernel.ld
diff --git a/core/embed/drv/linker/stm32u5a/memory.ld b/core/embed/drv/bsp/linker/stm32u5a/memory.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u5a/memory.ld
rename to core/embed/drv/bsp/linker/stm32u5a/memory.ld
diff --git a/core/embed/drv/linker/stm32u5a/prodtest.ld b/core/embed/drv/bsp/linker/stm32u5a/prodtest.ld
similarity index 100%
rename from core/embed/drv/linker/stm32u5a/prodtest.ld
rename to core/embed/drv/bsp/linker/stm32u5a/prodtest.ld
diff --git a/core/embed/models/trezor_bsp/stm32f4/stm32f4xx_hal_conf.h b/core/embed/drv/bsp/stm32hal/stm32f4/stm32f4xx_hal_conf.h
similarity index 100%
rename from core/embed/models/trezor_bsp/stm32f4/stm32f4xx_hal_conf.h
rename to core/embed/drv/bsp/stm32hal/stm32f4/stm32f4xx_hal_conf.h
diff --git a/core/embed/models/trezor_bsp/stm32u5/stm32u5xx_hal_conf.h b/core/embed/drv/bsp/stm32hal/stm32u5/stm32u5xx_hal_conf.h
similarity index 100%
rename from core/embed/models/trezor_bsp/stm32u5/stm32u5xx_hal_conf.h
rename to core/embed/drv/bsp/stm32hal/stm32u5/stm32u5xx_hal_conf.h
diff --git a/core/embed/models/trezor_bsp.h b/core/embed/drv/bsp/trezor_bsp.h
similarity index 100%
rename from core/embed/models/trezor_bsp.h
rename to core/embed/drv/bsp/trezor_bsp.h