diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-10 13:49:35 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-10 13:49:35 -0600 |
| commit | ab3453e7b12daef47b9e91da2a2a3d48615dc6fc (patch) | |
| tree | b36ffe46f4e98d1145b75daa0f84dbc473701eb9 /boot | |
| parent | 843143303cb64133427ab1b3166185e936233d50 (diff) | |
| parent | 8d24535e84856f9a881a9cd11d07842a42bc68a3 (diff) | |
| download | u-boot-ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.zip u-boot-ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.tar.gz u-boot-ab3453e7b12daef47b9e91da2a2a3d48615dc6fc.tar.bz2 | |
Merge patch series "Complete decoupling of zboot logic from commands"
Simon Glass <sjg@chromium.org> says:
This series refactors the zboot code to allow it to be used with
CONFIG_COMMAND disabled.
A new zboot_run() function is used to boot a zimage.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootmeth_cros.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index cd72db8..f015f2e 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -432,9 +432,9 @@ static int cros_boot(struct udevice *dev, struct bootflow *bflow) } if (IS_ENABLED(CONFIG_X86)) { - ret = zboot_start(map_to_sysmem(bflow->buf), bflow->size, 0, 0, - map_to_sysmem(bflow->x86_setup), - bflow->cmdline); + ret = zboot_run(map_to_sysmem(bflow->buf), bflow->size, 0, 0, + map_to_sysmem(bflow->x86_setup), + bflow->cmdline); } else { ret = bootm_boot_start(map_to_sysmem(bflow->buf), bflow->cmdline); |