From 0a93f7a7e99bf0872e019adeed08bf7b620a8985 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Sat, 5 Dec 2020 00:35:24 +0100 Subject: [PATCH] soc/amd/common/block/cpu: move Makefile guards into subfolders The next patch will add a tsc subfolder that might end up containing code that is guarded with different Kconfig options, so move the guards into the Makefiles in the subfolders instead of guarding the inclusion of the Makefiles in the subdirectories with the corresponding Kconfig option. Change-Id: Iafc867eb9adcb23e9a4878cc381684db6f9692d5 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/48312 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/soc/amd/common/block/cpu/Makefile.inc | 3 +-- src/soc/amd/common/block/cpu/car/Makefile.inc | 4 ++++ src/soc/amd/common/block/cpu/noncar/Makefile.inc | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) 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