diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc
index df2ccfaa2e..6298f3b746 100644
--- a/src/soc/amd/common/block/cpu/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/Makefile.inc
@@ -1 +1,2 @@
 subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car
+subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR) += noncar
diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.inc
new file mode 100644
index 0000000000..d6b8b52711
--- /dev/null
+++ b/src/soc/amd/common/block/cpu/noncar/Makefile.inc
@@ -0,0 +1 @@
+bootblock-y += pre_c.S
diff --git a/src/soc/amd/picasso/bootblock/pre_c.S b/src/soc/amd/common/block/cpu/noncar/pre_c.S
similarity index 100%
rename from src/soc/amd/picasso/bootblock/pre_c.S
rename to src/soc/amd/common/block/cpu/noncar/pre_c.S
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 6ec4cd1151..5f4ab9bddb 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -11,7 +11,6 @@ subdirs-y += ../../../cpu/x86/pae
 subdirs-y += ../../../cpu/x86/smm
 subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
 
-bootblock-y += bootblock/pre_c.S
 bootblock-y += bootblock/bootblock.c
 bootblock-y += aoac.c
 bootblock-y += southbridge.c