diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc
index 6298f3b746..4c0266396c 100644
--- a/src/soc/amd/common/block/cpu/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/Makefile.inc
@@ -1,2 +1 @@
-subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car
-subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR) += noncar
+subdirs-y += ./*
diff --git a/src/soc/amd/common/block/cpu/car/Makefile.inc b/src/soc/amd/common/block/cpu/car/Makefile.inc
index 639914040f..130b34b683 100644
--- a/src/soc/amd/common/block/cpu/car/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/car/Makefile.inc
@@ -1,3 +1,5 @@
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_CAR),y)
+
 bootblock-y += cache_as_ram.S
 bootblock-y += ap_exit_car.S
 bootblock-y += exit_car.S
@@ -6,3 +8,5 @@ postcar-y += exit_car.S
 
 romstage-y += ap_exit_car.S
 romstage-y += exit_car.S
+
+endif # CONFIG_SOC_AMD_COMMON_BLOCK_CAR
diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.inc
index d6b8b52711..7a3be34782 100644
--- a/src/soc/amd/common/block/cpu/noncar/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/noncar/Makefile.inc
@@ -1 +1,5 @@
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR),y)
+
 bootblock-y += pre_c.S
+
+endif # CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR