diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc
index 395ab08..df2ccfa 100644
--- a/src/soc/amd/common/block/cpu/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/Makefile.inc
@@ -1,8 +1 @@
-bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/cache_as_ram.S
-bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/ap_exit_car.S
-bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/exit_car.S
-
-postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/exit_car.S
-
-romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/ap_exit_car.S
-romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/exit_car.S
+subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car
diff --git a/src/soc/amd/common/block/cpu/car/Makefile.inc b/src/soc/amd/common/block/cpu/car/Makefile.inc
new file mode 100644
index 0000000..6399140
--- /dev/null
+++ b/src/soc/amd/common/block/cpu/car/Makefile.inc
@@ -0,0 +1,8 @@
+bootblock-y += cache_as_ram.S
+bootblock-y += ap_exit_car.S
+bootblock-y += exit_car.S
+
+postcar-y += exit_car.S
+
+romstage-y += ap_exit_car.S
+romstage-y += exit_car.S