summaryrefslogtreecommitdiff
path: root/src/soc/amd/common
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2020-11-23 15:54:28 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-11-30 07:59:02 +0000
commit63d36bc733a97ebf2a1c2f088d2fe834896d2087 (patch)
tree7365d08e26eef0fbc6d8387db0ed305fb9b30b65 /src/soc/amd/common
parent5ad4206e72a315c70904716c461cc1d8c7a855df (diff)
soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory
Since there are sub-directories for both the cache-as-RAM case and the non-CAR case where the RAM is already initialized when the x86 cores are released from reset, move the CAR-specific parts of the Makefile.inc to another Makefile.inc in the car sub-directory. Further patches will add a Makefile.inc to the non-CAR directory. Change-Id: I43a3039237d96e02baa33488e71c5f24effe8359 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47875 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/common')
-rw-r--r--src/soc/amd/common/block/cpu/Makefile.inc9
-rw-r--r--src/soc/amd/common/block/cpu/car/Makefile.inc8
2 files changed, 9 insertions, 8 deletions
diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc
index 395ab084a3..df2ccfaa2e 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 0000000000..639914040f
--- /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