1 files changed, 4 insertions, 9 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index b5957b9b1d..cb42582d87 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -10,17 +10,14 @@ all-y += aoac.c
 all-y += config.c
 all-y += i2c.c
 
+# all_x86-y adds the compilation unit to all stages that run on the x86 cores
+all_x86-y += gpio.c
+all_x86-y += uart.c
+
 bootblock-y += early_fch.c
-bootblock-y += gpio.c
-bootblock-y += uart.c
 
 romstage-y += fsp_m_params.c
-romstage-y += gpio.c
 romstage-y += romstage.c
-romstage-y += uart.c
-
-verstage_x86-y += gpio.c
-verstage_x86-y += uart.c
 
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += agesa_acpi.c
@@ -28,14 +25,12 @@ ramstage-y += chip.c
 ramstage-y += cpu.c
 ramstage-y += fch.c
 ramstage-y += fsp_s_params.c
-ramstage-y += gpio.c
 ramstage-y += graphics.c
 ramstage-y += mca.c
 ramstage-y += pcie_gpp.c
 ramstage-y += root_complex.c
 ramstage-y += sata.c
 ramstage-y += soc_util.c
-ramstage-y += uart.c
 ramstage-y += xhci.c
 
 smm-y += smihandler.c