Change in coreboot[master]: soc/amd/common/block/cpu: move Makefile guards into subfolders
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48312 )
Change subject: soc/amd/common/block/cpu: move Makefile guards into subfolders ......................................................................
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 felix-coreboot@felixheld.de --- M src/soc/amd/common/block/cpu/Makefile.inc M src/soc/amd/common/block/cpu/car/Makefile.inc M src/soc/amd/common/block/cpu/noncar/Makefile.inc 3 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/48312/1
diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc index 6298f3b..4c02663 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 6399140..130b34b 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 @@
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 d6b8b52..7a3be34 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
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48312 )
Change subject: soc/amd/common/block/cpu: move Makefile guards into subfolders ......................................................................
Patch Set 1: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48312 )
Change subject: soc/amd/common/block/cpu: move Makefile guards into subfolders ......................................................................
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 felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/48312 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/soc/amd/common/block/cpu/Makefile.inc M src/soc/amd/common/block/cpu/car/Makefile.inc M src/soc/amd/common/block/cpu/noncar/Makefile.inc 3 files changed, 9 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved
diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc index 6298f3b..4c02663 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 6399140..130b34b 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 @@
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 d6b8b52..7a3be34 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
-
Felix Held (Code Review) -
Marshall Dawson (Code Review)