Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
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 --- M src/soc/amd/common/block/cpu/Makefile.inc A src/soc/amd/common/block/cpu/car/Makefile.inc 2 files changed, 13 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/47875/1
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..130b34b --- /dev/null +++ b/src/soc/amd/common/block/cpu/car/Makefile.inc @@ -0,0 +1,12 @@ +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 + +postcar-y += exit_car.S + +romstage-y += ap_exit_car.S +romstage-y += exit_car.S + +endif # CONFIG_SOC_AMD_COMMON_BLOCK_CAR