Change in coreboot[master]: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory
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
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 1:
a few easy to review patches
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... File src/soc/amd/common/block/cpu/car/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... PS1, Line 1: ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_CAR),y) Guard is unnecessary
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... File src/soc/amd/common/block/cpu/car/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... PS1, Line 1: ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_CAR),y)
Guard is unnecessary
oh, right. I wonder if it would be better to drop the guard here or in the makefile in the parent folder; the common pattern is that the parent makefile includes all makefiles in the folders below and those have the guards. might be a good idea to switch over to that
Hello Jason Glenesk, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Marshall Dawson, Angel Pons, Nikolai Vyssotski,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47875
to look at the new patch set (#2).
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/2
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... File src/soc/amd/common/block/cpu/car/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... PS1, Line 1: ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_CAR),y)
oh, right. […]
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... File src/soc/amd/common/block/cpu/car/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... PS1, Line 1: ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_CAR),y)
Done
I believe having the guard in the parent Makefile feels more natural. The ifeq/endif pattern duplicates the CONFIG_SOC_AMD_COMMON_BLOCK_CAR name.
Hello build bot (Jenkins), Jason Glenesk, Furquan Shaikh, Patrick Georgi, Martin Roth, Marshall Dawson, Angel Pons, Nikolai Vyssotski,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47875
to look at the new patch set (#3).
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, 9 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/47875/3
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... File src/soc/amd/common/block/cpu/car/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/47875/1/src/soc/amd/common/block/cp... PS1, Line 1: ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_CAR),y)
I believe having the guard in the parent Makefile feels more natural. […]
since i'm not using a wildcard in the makefile in the parent folder, i moved the guard over there. a bit inconsistent with the rest, but since i don't think there will be a third directory in there any time soon, i'm ok with that
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47875 )
Change subject: soc/amd/common/block/cpu: move CAR-specific Makefile to sub-directory ......................................................................
Patch Set 3: Code-Review+2
Patrick Georgi has submitted this change. ( 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 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 --- M src/soc/amd/common/block/cpu/Makefile.inc A src/soc/amd/common/block/cpu/car/Makefile.inc 2 files changed, 9 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: 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 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
-
Angel Pons (Code Review) -
Felix Held (Code Review)
-
Patrick Georgi (Code Review)