Denis 'GNUtoo' Carikli has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: [WIP] asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
[WIP] asrock/e350m1: Switch away from ROMCC_BOOTBLOCK
Change-Id: Ie14db10b6a72e19ac67254ca8f95bcf6ac8af8d3 Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@cyberdimension.org --- M src/mainboard/asrock/e350m1/Kconfig M src/mainboard/asrock/e350m1/Makefile.inc R src/mainboard/asrock/e350m1/bootblock.c 3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/37703/1
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 86eaac8..3bbc2a5 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -17,7 +17,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select ROMCC_BOOTBLOCK select CPU_AMD_AGESA_FAMILY14 select NORTHBRIDGE_AMD_AGESA_FAMILY14 select SOUTHBRIDGE_AMD_CIMX_SB800 diff --git a/src/mainboard/asrock/e350m1/Makefile.inc b/src/mainboard/asrock/e350m1/Makefile.inc index 440744c..ffea060 100644 --- a/src/mainboard/asrock/e350m1/Makefile.inc +++ b/src/mainboard/asrock/e350m1/Makefile.inc @@ -13,6 +13,8 @@ # GNU General Public License for more details. #
+bootblock-y += bootblock.c + romstage-y += buildOpts.c romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/bootblock.c similarity index 89% rename from src/mainboard/asrock/e350m1/romstage.c rename to src/mainboard/asrock/e350m1/bootblock.c index 27a1fac..bdc8c6c 100644 --- a/src/mainboard/asrock/e350m1/romstage.c +++ b/src/mainboard/asrock/e350m1/bootblock.c @@ -13,15 +13,14 @@ * GNU General Public License for more details. */
-#include <northbridge/amd/agesa/state_machine.h> +#include <bootblock_common.h> #include <superio/nuvoton/common/nuvoton.h> #include <superio/nuvoton/nct5572d/nct5572d.h> #include <sb_cimx.h>
#define SERIAL_DEV PNP_DEV(0x2e, NCT5572D_SP1)
- -void board_BeforeAgesa(struct sysinfo *cb) +void bootblock_mainboard_early_init(void) { sb_Poweron_Init(); nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: [WIP] asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37703/1/src/mainboard/asrock/e350m1... File src/mainboard/asrock/e350m1/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37703/1/src/mainboard/asrock/e350m1... PS1, Line 25: sb_Poweron_Init(); To our current knowledge you can remove this. We call it later in romstage in common code.
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37703
to look at the new patch set (#2).
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
asrock/e350m1: Switch away from ROMCC_BOOTBLOCK
Change-Id: Ie14db10b6a72e19ac67254ca8f95bcf6ac8af8d3 Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@cyberdimension.org --- M src/mainboard/asrock/e350m1/Kconfig M src/mainboard/asrock/e350m1/Makefile.inc R src/mainboard/asrock/e350m1/bootblock.c 3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/37703/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/+/37703
to look at the new patch set (#3).
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
asrock/e350m1: Switch away from ROMCC_BOOTBLOCK
Change-Id: Ie14db10b6a72e19ac67254ca8f95bcf6ac8af8d3 Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@cyberdimension.org --- M src/mainboard/asrock/e350m1/Kconfig M src/mainboard/asrock/e350m1/Makefile.inc R src/mainboard/asrock/e350m1/bootblock.c 3 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/37703/3
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 3: Code-Review+1
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 3: Code-Review+2
Thanks, I can see the fresh board-status. Once this is merged, upload with BOOTBLOCK_CONSOLE=y would be nice.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37703/3/src/mainboard/asrock/e350m1... File src/mainboard/asrock/e350m1/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37703/3/src/mainboard/asrock/e350m1... PS3, Line 19: #include <sb_cimx.h> unused?
Kyösti Mälkki has uploaded a new patch set (#4) to the change originally created by Denis 'GNUtoo' Carikli. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
asrock/e350m1: Switch away from ROMCC_BOOTBLOCK
Change-Id: Ie14db10b6a72e19ac67254ca8f95bcf6ac8af8d3 Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@cyberdimension.org --- M src/mainboard/asrock/e350m1/Kconfig M src/mainboard/asrock/e350m1/Makefile.inc R src/mainboard/asrock/e350m1/bootblock.c 3 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/37703/4
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 4:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37703/1/src/mainboard/asrock/e350m1... File src/mainboard/asrock/e350m1/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37703/1/src/mainboard/asrock/e350m1... PS1, Line 25: sb_Poweron_Init();
To our current knowledge you can remove this. We call it later in romstage in common code.
Done
https://review.coreboot.org/c/coreboot/+/37703/3/src/mainboard/asrock/e350m1... File src/mainboard/asrock/e350m1/bootblock.c:
https://review.coreboot.org/c/coreboot/+/37703/3/src/mainboard/asrock/e350m1... PS3, Line 19: #include <sb_cimx.h>
unused?
Done
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 4: Code-Review+2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 4: Code-Review+2
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37703 )
Change subject: asrock/e350m1: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 5:
Just for the record, this adds 150 ms to the boot time.
Start of postcar 300 ms vs 431 ms, and decompressing ramstage also takes 58 ms vs 90 ms. The size is almost the same though.
fallback/ramstage 0x2ddc0 stage 117058 none
fallback/ramstage 0x2d600 stage 117067 none
https://review.coreboot.org/cgit/board-status.git/tree/asrock/e350m1/4.11-41...
``` 23 entries total:
0:1st timestamp 10,706 1:start of romstage 10,845 (138) 2:before ram initialization 95,930 (85,084) 3:after ram initialization 289,692 (193,761) 4:end of romstage 299,999 (10,307) 100:start of postcar 300,098 (98) 101:end of postcar 300,098 (0) 8:starting to load ramstage 300,159 (60) 15:starting LZMA decompress (ignore for x86) 300,178 (19) 16:finished LZMA decompress (ignore for x86) 358,763 (58,584) 9:finished loading ramstage 359,578 (814) 10:start of ramstage 359,607 (29) 30:device enumeration 363,538 (3,931) 40:device configuration 500,300 (136,762) 50:device enable 511,960 (11,659) 60:device initialization 512,361 (400) 70:device setup done 526,808 (14,447) 75:cbmem post 780,877 (254,068) 80:write tables 780,882 (4) 85:finalize chips 802,083 (21,200) 90:load payload 802,157 (74) 15:starting LZMA decompress (ignore for x86) 802,392 (234) 16:finished LZMA decompress (ignore for x86) 837,105 (34,713) 99:selfboot jump 837,143 (37)
Total Time: 826,423 ```
https://review.coreboot.org/cgit/board-status.git/tree/asrock/e350m1/4.11-41...
``` 27 entries total:
0:1st timestamp 8,058 11:start of bootblock 15,134 (7,075) 12:end of bootblock 16,302 (1,168) 13:starting to load romstage 17,005 (702) 14:finished loading romstage 17,092 (87) 1:start of romstage 17,420 (328) 2:before ram initialization 131,117 (113,697) 3:after ram initialization 414,055 (282,937) 4:end of romstage 430,957 (16,901) 100:start of postcar 431,056 (99) 101:end of postcar 431,057 (0) 8:starting to load ramstage 431,167 (110) 15:starting LZMA decompress (ignore for x86) 431,203 (36) 16:finished LZMA decompress (ignore for x86) 520,445 (89,241) 9:finished loading ramstage 521,266 (820) 10:start of ramstage 521,296 (30) 30:device enumeration 525,238 (3,942) 40:device configuration 662,195 (136,956) 50:device enable 673,866 (11,670) 60:device initialization 674,268 (401) 70:device setup done 688,757 (14,489) 75:cbmem post 935,437 (246,680) 80:write tables 935,442 (4) 85:finalize chips 974,449 (39,006) 90:load payload 974,523 (74) 15:starting LZMA decompress (ignore for x86) 974,940 (416) 16:finished LZMA decompress (ignore for x86) 1,027,574 (52,634) 99:selfboot jump 1,027,629 (54)
Total Time: 1,019,557 ```