diff options
| author | Simon Glass <[email protected]> | 2023-08-24 13:55:45 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-08-26 10:07:32 -0400 |
| commit | 71f634b822ae6613c43fc960d5afbe5b5d728fb4 (patch) | |
| tree | 4f1d3e80cbca579f5dc8ba678391e1cb499a80a4 /test | |
| parent | 966b16c59a70cd2e3383eb77d49c1e62b093b36f (diff) | |
bootstd: cros: Allow detection of any kernel partition
The existing ChromiumOS bootmeth only supports reading a single kernel
partition, either 2 or 4. In fact there are normally two options
available.
Use the GUID to detect kernel partitions, with the BOOTMETHF_ANY_PART
flag, so that bootstd does not require a valid filesystem before calling
the bootmeth.
Tidy up and improve the logging while we are here.
Signed-off-by: Simon Glass <[email protected]>
Suggested-by: Alper Nebi Yasak <[email protected]>
[trini: Add missing select of PARTITION_TYPE_GUID]
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'test')
| -rw-r--r-- | test/boot/bootflow.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index ae34370981c..1ff2320c036 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -983,9 +983,10 @@ static int bootflow_cros(struct unit_test_state *uts) ut_assert_nextlinen("Seq"); ut_assert_nextlinen("---"); ut_assert_nextlinen(" 0 extlinux"); - ut_assert_nextlinen(" 1 cros ready mmc 2 mmc5.bootdev.whole "); + ut_assert_nextlinen(" 1 cros ready mmc 2 mmc5.bootdev.part_2 "); + ut_assert_nextlinen(" 2 cros ready mmc 4 mmc5.bootdev.part_4 "); ut_assert_nextlinen("---"); - ut_assert_skip_to_line("(2 bootflows, 2 valid)"); + ut_assert_skip_to_line("(3 bootflows, 3 valid)"); ut_assert_console_end(); |