Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36874 )
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
soc/intel/baytrail: Start VBOOT in bootblock
The earlier the more that can be updated via RW fmap regions.
Change-Id: Ifcaf6ad8e27c09fee99cf6a8b12f9fadcb0cef2c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/mainboard/google/rambi/Makefile.inc M src/soc/intel/baytrail/Kconfig M src/soc/intel/baytrail/Makefile.inc M src/soc/intel/baytrail/pmutil.c 4 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/36874/1
diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.inc index 0e80b64..6660d23 100644 --- a/src/mainboard/google/rambi/Makefile.inc +++ b/src/mainboard/google/rambi/Makefile.inc @@ -13,6 +13,7 @@ ## GNU General Public License for more details. ##
+verstage-$(CONFIG_CHROMEOS) += chromeos.c romstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig index cfea93a..e4e8c30 100644 --- a/src/soc/intel/baytrail/Kconfig +++ b/src/soc/intel/baytrail/Kconfig @@ -41,11 +41,8 @@
config VBOOT select VBOOT_MUST_REQUEST_DISPLAY - select VBOOT_STARTS_IN_ROMSTAGE - -config BOOTBLOCK_CPU_INIT - string - default "soc/intel/baytrail/bootblock/bootblock.c" + select VBOOT_STARTS_IN_BOOTBLOCK + select VBOOT_SEPARATE_VERSTAGE
config MMCONF_BASE_ADDRESS hex diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc index eda3e25..d21f744 100644 --- a/src/soc/intel/baytrail/Makefile.inc +++ b/src/soc/intel/baytrail/Makefile.inc @@ -16,6 +16,8 @@ bootblock-y += ../../../cpu/x86/early_reset.S bootblock-y += bootblock/bootblock.c
+verstage-y += pmutil.c + romstage-y += iosf.c romstage-y += memmap.c romstage-y += pmutil.c diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c index 51174fc..2d14d84 100644 --- a/src/soc/intel/baytrail/pmutil.c +++ b/src/soc/intel/baytrail/pmutil.c @@ -368,7 +368,10 @@ { uint32_t gen_pmcon1; int rtc_fail; - struct chipset_power_state *ps = cbmem_find(CBMEM_ID_POWER_STATE); + struct chipset_power_state *ps = NULL; + + if (ENV_RAMSTAGE) + ps = cbmem_find(CBMEM_ID_POWER_STATE);
if (ps != NULL) gen_pmcon1 = ps->gen_pmcon1;
Hello Patrick Rudolph, Matt DeVillier, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36874
to look at the new patch set (#3).
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
soc/intel/baytrail: Start VBOOT in bootblock
The earlier the more that can be updated via RW fmap regions.
Change-Id: Ifcaf6ad8e27c09fee99cf6a8b12f9fadcb0cef2c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/mainboard/google/rambi/Makefile.inc M src/soc/intel/baytrail/Kconfig M src/soc/intel/baytrail/Makefile.inc M src/soc/intel/baytrail/pmutil.c 4 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/36874/3
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36874 )
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36874/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/36874/4//COMMIT_MSG@9 PS4, Line 9: The earlier the more that can be updated via RW fmap regions. Except for the mrc.bin, which isn't relocatable. I think that's why this is configured that way. So, is it useful to have romstage twice if both copies call into the same mrc?
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36874 )
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36874/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/36874/4//COMMIT_MSG@9 PS4, Line 9: The earlier the more that can be updated via RW fmap regions.
Except for the mrc.bin, which isn't relocatable. I think that's why this is configured that way. So, is it useful to have romstage twice if both copies call into the same mrc?
Not everything is done by the mrc.bin. The mrc is actually an elf instead of a plain binary so it might be possible to relocate it?
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Matt DeVillier, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36874
to look at the new patch set (#5).
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
soc/intel/baytrail: Start VBOOT in bootblock
The earlier the more that can be updated via RW fmap regions.
Change-Id: Ifcaf6ad8e27c09fee99cf6a8b12f9fadcb0cef2c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/mainboard/google/rambi/Makefile.inc M src/soc/intel/baytrail/Kconfig M src/soc/intel/baytrail/Makefile.inc M src/soc/intel/baytrail/pmutil.c 4 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/36874/5
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36874 )
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
Patch Set 5:
(1 comment)
https://review.coreboot.org/c/coreboot/+/36874/4//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/36874/4//COMMIT_MSG@9 PS4, Line 9: The earlier the more that can be updated via RW fmap regions.
Except for the mrc.bin, which isn't relocatable. I think that's why this is configured that way. […]
We might as well get rid of it. It doesn't like the UDIMMs on my Asrock Q1900M >:(
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/36874?usp=email )
Change subject: soc/intel/baytrail: Start VBOOT in bootblock ......................................................................
Abandoned
This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)
-
Martin L Roth (Code Review)
-
Patrick Georgi (Code Review)