diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index f010c7b055..b5e409b055 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -11,7 +11,7 @@ subdirs-y += ../../../cpu/x86/pae
 subdirs-y += ../../../cpu/x86/smm
 subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
 
-bootblock-y += bootblock/bootblock.c
+bootblock-y += bootblock.c
 bootblock-y += aoac.c
 bootblock-y += southbridge.c
 bootblock-y += i2c.c
diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock.c
similarity index 100%
rename from src/soc/amd/picasso/bootblock/bootblock.c
rename to src/soc/amd/picasso/bootblock.c
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 311ea6886b..8cdf6ccdbe 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -12,7 +12,7 @@ subdirs-y += ../../../cpu/x86/smm
 
 bootblock-$(CONFIG_STONEYRIDGE_UART) += uart.c
 bootblock-y += BiosCallOuts.c
-bootblock-y += bootblock/bootblock.c
+bootblock-y += bootblock.c
 bootblock-y += gpio.c
 bootblock-y += i2c.c
 bootblock-y += enable_usbdebug.c
diff --git a/src/soc/amd/stoneyridge/bootblock/bootblock.c b/src/soc/amd/stoneyridge/bootblock.c
similarity index 100%
rename from src/soc/amd/stoneyridge/bootblock/bootblock.c
rename to src/soc/amd/stoneyridge/bootblock.c