Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src: Update more makefiles to exclude files from psp_verstage ......................................................................
src: Update more makefiles to exclude files from psp_verstage
These are files controlled by options that aren't needed for psp_verstage.
BUG=b:158124527 TEST=Build & boot Trembyle with psp_verstage
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I63942ad896d205c327d65bb8083da817b972962b --- M src/drivers/pc80/rtc/Makefile.inc M src/soc/amd/common/block/acpimmio/Makefile.inc 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/42808/1
diff --git a/src/drivers/pc80/rtc/Makefile.inc b/src/drivers/pc80/rtc/Makefile.inc index c0dd127..33d97c0 100644 --- a/src/drivers/pc80/rtc/Makefile.inc +++ b/src/drivers/pc80/rtc/Makefile.inc @@ -1,7 +1,7 @@ ifeq ($(CONFIG_ARCH_X86),y)
bootblock-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_boot.c -verstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_boot.c +verstage_x86-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_boot.c postcar-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_boot.c romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_boot.c ramstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_boot.c @@ -13,14 +13,14 @@ smm-$(CONFIG_DRIVERS_MC146818) += mc146818rtc.c
bootblock-$(CONFIG_USE_OPTION_TABLE) += option.c -verstage-$(CONFIG_USE_OPTION_TABLE) += option.c +verstage_x86-$(CONFIG_USE_OPTION_TABLE) += option.c postcar-$(CONFIG_USE_OPTION_TABLE) += option.c romstage-$(CONFIG_USE_OPTION_TABLE) += option.c ramstage-$(CONFIG_USE_OPTION_TABLE) += option.c smm-$(CONFIG_USE_OPTION_TABLE) += option.c
bootblock-$(CONFIG_CMOS_POST) += post.c -verstage-$(CONFIG_CMOS_POST) += post.c +verstage_x86-$(CONFIG_CMOS_POST) += post.c postcar-$(CONFIG_CMOS_POST) += post.c romstage-$(CONFIG_CMOS_POST) += post.c ramstage-$(CONFIG_CMOS_POST) += post.c diff --git a/src/soc/amd/common/block/acpimmio/Makefile.inc b/src/soc/amd/common/block/acpimmio/Makefile.inc index 69253b9..553d9e2 100644 --- a/src/soc/amd/common/block/acpimmio/Makefile.inc +++ b/src/soc/amd/common/block/acpimmio/Makefile.inc @@ -6,7 +6,7 @@ smm-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += mmio_util.c
bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c -verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c +verstage_x86-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src: Update more makefiles to exclude files from psp_verstage ......................................................................
Patch Set 1: Code-Review+2
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src: Update more makefiles to exclude files from psp_verstage ......................................................................
Patch Set 2:
My previous requests for excluding some of these files from psp-verstage was due to my misunderstanding of having no <arch/io.h> for ENV_ARM. In my opinion, the use of verstage_x86 should only be applied to files with dependencies on <arch/x86/xx> or <cpu/x86/xx>.
As I see it, PSP kernel will provide some routing of x86 IO space to MMIO space, and you will provide <arch/io.h> somewhere. In my opinion it is desireable to be able to build CMOS/NVRAM and POST80 ioport into verstage, even if you do not currently use those. I don't immediately see where the build would currently fail and applying verstage_x86 seems unnecessary with garbage collection.
Hello build bot (Jenkins), Raul Rangel, Patrick Georgi, Julius Werner, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42808
to look at the new patch set (#3).
Change subject: src: Update more makefiles to exclude files from psp_verstage ......................................................................
src: Update more makefiles to exclude files from psp_verstage
These are files controlled by options that aren't needed for psp_verstage.
BUG=b:158124527 TEST=Build & boot Trembyle with psp_verstage
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I63942ad896d205c327d65bb8083da817b972962b --- M src/drivers/pc80/rtc/Makefile.inc M src/soc/amd/common/block/acpimmio/Makefile.inc 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/42808/3
Hello build bot (Jenkins), Raul Rangel, Patrick Georgi, Julius Werner, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42808
to look at the new patch set (#4).
Change subject: src: exclude biosram from psp_verstage ......................................................................
src: exclude biosram from psp_verstage
This isn't needed for psp_verstage, and causes build failures if included.
BUG=b:158124527 TEST=Build & boot Trembyle with psp_verstage
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I63942ad896d205c327d65bb8083da817b972962b --- M src/soc/amd/common/block/acpimmio/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/42808/4
Hello build bot (Jenkins), Raul Rangel, Patrick Georgi, Julius Werner, Aaron Durbin,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42808
to look at the new patch set (#5).
Change subject: src/amd/common: Exclude biosram from psp_verstage ......................................................................
src/amd/common: Exclude biosram from psp_verstage
This isn't needed for psp_verstage, and causes build failures if included.
BUG=b:158124527 TEST=Build & boot Trembyle with psp_verstage
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I63942ad896d205c327d65bb8083da817b972962b --- M src/soc/amd/common/block/acpimmio/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/42808/5
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src/amd/common: Exclude biosram from psp_verstage ......................................................................
Patch Set 5:
Patch Set 2:
My previous requests for excluding some of these files from psp-verstage was due to my misunderstanding of having no <arch/io.h> for ENV_ARM. In my opinion, the use of verstage_x86 should only be applied to files with dependencies on <arch/x86/xx> or <cpu/x86/xx>.
As I see it, PSP kernel will provide some routing of x86 IO space to MMIO space, and you will provide <arch/io.h> somewhere. In my opinion it is desireable to be able to build CMOS/NVRAM and POST80 ioport into verstage, even if you do not currently use those. I don't immediately see where the build would currently fail and applying verstage_x86 seems unnecessary with garbage collection.
Updated to only remove biosram.c
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src/amd/common: Exclude biosram from psp_verstage ......................................................................
Patch Set 5: Code-Review+2
Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src/amd/common: Exclude biosram from psp_verstage ......................................................................
src/amd/common: Exclude biosram from psp_verstage
This isn't needed for psp_verstage, and causes build failures if included.
BUG=b:158124527 TEST=Build & boot Trembyle with psp_verstage
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I63942ad896d205c327d65bb8083da817b972962b Reviewed-on: https://review.coreboot.org/c/coreboot/+/42808 Reviewed-by: Raul Rangel rrangel@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/amd/common/block/acpimmio/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Raul Rangel: Looks good to me, approved
diff --git a/src/soc/amd/common/block/acpimmio/Makefile.inc b/src/soc/amd/common/block/acpimmio/Makefile.inc index 69253b9..553d9e2 100644 --- a/src/soc/amd/common/block/acpimmio/Makefile.inc +++ b/src/soc/amd/common/block/acpimmio/Makefile.inc @@ -6,7 +6,7 @@ smm-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += mmio_util.c
bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c -verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c +verstage_x86-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO) += biosram.c
Kyösti Mälkki has created a revert of this change. ( https://review.coreboot.org/c/coreboot/+/42808 )
Change subject: src/amd/common: Exclude biosram from psp_verstage ......................................................................