Change in coreboot[master]: soc/amd: move assembly part of non-CAR bootblock to common directory
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47880 )
Change subject: soc/amd: move assembly part of non-CAR bootblock to common directory ......................................................................
soc/amd: move assembly part of non-CAR bootblock to common directory
There will be more files added to the common non-CAR Makefile.inc, so use an ifeq statement there.
Change-Id: I1f71954d27fbf10725387a0e95bc57f5040024cc 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/noncar/Makefile.inc R src/soc/amd/common/block/cpu/noncar/pre_c.S M src/soc/amd/picasso/Makefile.inc 4 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/47880/1
diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc index df2ccfa..6298f3b 100644 --- a/src/soc/amd/common/block/cpu/Makefile.inc +++ b/src/soc/amd/common/block/cpu/Makefile.inc @@ -1 +1,2 @@ subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car +subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR) += noncar diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.inc new file mode 100644 index 0000000..7a3be34 --- /dev/null +++ b/src/soc/amd/common/block/cpu/noncar/Makefile.inc @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR),y) + +bootblock-y += pre_c.S + +endif # CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR diff --git a/src/soc/amd/picasso/bootblock/pre_c.S b/src/soc/amd/common/block/cpu/noncar/pre_c.S similarity index 100% rename from src/soc/amd/picasso/bootblock/pre_c.S rename to src/soc/amd/common/block/cpu/noncar/pre_c.S diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 6ec4cd1..5f4ab9b 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -11,7 +11,6 @@ subdirs-y += ../../../cpu/x86/smm subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
-bootblock-y += bootblock/pre_c.S bootblock-y += bootblock/bootblock.c bootblock-y += aoac.c bootblock-y += southbridge.c
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47880
to look at the new patch set (#2).
Change subject: soc/amd: move assembly part of non-CAR bootblock to common directory ......................................................................
soc/amd: move assembly part of non-CAR bootblock to common directory
There will be more files added to the common non-CAR Makefile.inc, so use an ifeq statement there.
Change-Id: I1f71954d27fbf10725387a0e95bc57f5040024cc 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/noncar/Makefile.inc R src/soc/amd/common/block/cpu/noncar/pre_c.S M src/soc/amd/picasso/Makefile.inc 4 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/47880/2
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47880
to look at the new patch set (#3).
Change subject: soc/amd: move assembly part of non-CAR bootblock to common directory ......................................................................
soc/amd: move assembly part of non-CAR bootblock to common directory
There will be more files added to the common non-CAR Makefile.inc, so use an ifeq statement there.
Change-Id: I1f71954d27fbf10725387a0e95bc57f5040024cc 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/noncar/Makefile.inc R src/soc/amd/common/block/cpu/noncar/pre_c.S M src/soc/amd/picasso/Makefile.inc 4 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/47880/3
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47880
to look at the new patch set (#4).
Change subject: soc/amd: move assembly part of non-CAR bootblock to common directory ......................................................................
soc/amd: move assembly part of non-CAR bootblock to common directory
There will be more files added to the common non-CAR Makefile.inc, so use an ifeq statement there.
Change-Id: I1f71954d27fbf10725387a0e95bc57f5040024cc 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/noncar/Makefile.inc R src/soc/amd/common/block/cpu/noncar/pre_c.S M src/soc/amd/picasso/Makefile.inc 4 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/47880/4
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47880 )
Change subject: soc/amd: move assembly part of non-CAR bootblock to common directory ......................................................................
Patch Set 4: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47880 )
Change subject: soc/amd: move assembly part of non-CAR bootblock to common directory ......................................................................
soc/amd: move assembly part of non-CAR bootblock to common directory
There will be more files added to the common non-CAR Makefile.inc, so use an ifeq statement there.
Change-Id: I1f71954d27fbf10725387a0e95bc57f5040024cc Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/47880 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com --- M src/soc/amd/common/block/cpu/Makefile.inc A src/soc/amd/common/block/cpu/noncar/Makefile.inc R src/soc/amd/common/block/cpu/noncar/pre_c.S M src/soc/amd/picasso/Makefile.inc 4 files changed, 2 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Martin Roth: 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 df2ccfa..6298f3b 100644 --- a/src/soc/amd/common/block/cpu/Makefile.inc +++ b/src/soc/amd/common/block/cpu/Makefile.inc @@ -1 +1,2 @@ subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car +subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR) += noncar diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.inc new file mode 100644 index 0000000..d6b8b52 --- /dev/null +++ b/src/soc/amd/common/block/cpu/noncar/Makefile.inc @@ -0,0 +1 @@ +bootblock-y += pre_c.S diff --git a/src/soc/amd/picasso/bootblock/pre_c.S b/src/soc/amd/common/block/cpu/noncar/pre_c.S similarity index 100% rename from src/soc/amd/picasso/bootblock/pre_c.S rename to src/soc/amd/common/block/cpu/noncar/pre_c.S diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 6ec4cd1..5f4ab9b 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -11,7 +11,6 @@ subdirs-y += ../../../cpu/x86/smm subdirs-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += psp_verstage
-bootblock-y += bootblock/pre_c.S bootblock-y += bootblock/bootblock.c bootblock-y += aoac.c bootblock-y += southbridge.c
-
Felix Held (Code Review) -
Martin Roth (Code Review)