Change in coreboot[master]: soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/1
diff --git a/src/soc/intel/common/block/cpu/Makefile.inc b/src/soc/intel/common/block/cpu/Makefile.inc index 3d6adce..c572928 100644 --- a/src/soc/intel/common/block/cpu/Makefile.inc +++ b/src/soc/intel/common/block/cpu/Makefile.inc @@ -1,10 +1,12 @@ +ifneq ($(CONFIG_FSP_CAR),y) bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CAR) += car/cache_as_ram.S bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CAR) += ../../../../../cpu/x86/early_reset.S -bootblock-$(CONFIG_FSP_CAR)+= car/cache_as_ram_fsp.S -bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c - postcar-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CAR) += car/exit_car.S -postcar-$(CONFIG_FSP_CAR) += car/exit_car_fsp.S +else +bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU)+= car/cache_as_ram_fsp.S +postcar-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += car/exit_car_fsp.S +endif
+bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT) += mp_init.c
Arthur Heymans has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Abandoned
It's used apparently. Thank you, Jenkins!
Arthur Heymans has restored this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Restored
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#2).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/2
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#4).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/4
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#5).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/5
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 5:
superseeded by 36622
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 5:
(2 comments)
https://review.coreboot.org/c/coreboot/+/36168/5/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/5/src/soc/intel/common/block/... PS5, Line 1: n why the negation? it makes it much harder too read, imho
https://review.coreboot.org/c/coreboot/+/36168/5/src/soc/intel/common/block/... PS5, Line 10: double empty lines
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#6).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/6
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36168/6/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/6/src/soc/intel/common/block/... PS6, Line 1: ifeq ($(CONFIG_FSP_CAR),n) It's not 'n' if not selected.
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#7).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/7
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 7:
(3 comments)
https://review.coreboot.org/c/coreboot/+/36168/5/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/5/src/soc/intel/common/block/... PS5, Line 1: n
why the negation? it makes it much harder too read, imho
moved
https://review.coreboot.org/c/coreboot/+/36168/5/src/soc/intel/common/block/... PS5, Line 10:
double empty lines
Done
https://review.coreboot.org/c/coreboot/+/36168/6/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/6/src/soc/intel/common/block/... PS6, Line 1: ifeq ($(CONFIG_FSP_CAR),n)
It's not 'n' if not selected.
Ack, but it's y if selected ;) you could check for an empty string, or what I would prefer: check for y and switch the if/else blocks.
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#8).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/8
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 9: Code-Review+1
(3 comments)
https://review.coreboot.org/c/coreboot/+/36168/6/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/6/src/soc/intel/common/block/... PS6, Line 1: ifeq ($(CONFIG_FSP_CAR),n)
Ack, but it's y if selected ;) you could check for an empty string, or […]
Thank you, it looks much better, imho.
https://review.coreboot.org/c/coreboot/+/36168/9/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/9/src/soc/intel/common/block/... PS9, Line 9: postcar-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c Please mention this drop in the commit message.
https://review.coreboot.org/c/coreboot/+/36168/9/src/soc/intel/common/block/... PS9, Line 2: bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU)+= car/cache_as_ram_fsp.S missing space before +=
Hello Patrick Rudolph, Subrata Banik, build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36168
to look at the new patch set (#10).
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
soc/intel/common: Make native and FSP-T CAR init mutually exclusive
postcar stage does not consume cpulib.c, so don't include it there.
Change-Id: Ie723412dcf09151cdbb41e357ad9c2e4f393cb47 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Makefile.inc 1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/36168/10
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 10: Code-Review+2
(2 comments)
https://review.coreboot.org/c/coreboot/+/36168/9/src/soc/intel/common/block/... File src/soc/intel/common/block/cpu/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/36168/9/src/soc/intel/common/block/... PS9, Line 9: postcar-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU) += cpulib.c
Please mention this drop in the commit message.
Done
https://review.coreboot.org/c/coreboot/+/36168/9/src/soc/intel/common/block/... PS9, Line 2: bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_CPU)+= car/cache_as_ram_fsp.S
missing space before +=
Done
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36168 )
Change subject: soc/intel/common: Make native and FSP-T CAR init mutually exclusive ......................................................................
Patch Set 10: Code-Review+2
-
Arthur Heymans (Code Review) -
Martin Roth (Code Review)
-
Michael Niewöhner (Code Review)
-
Nico Huber (Code Review)