bootm: Create a function to run through the bootz states
In a few places, the bootz command is used to handle a boot. We want
these to be done without needing CONFIG_CMDLINE, so add a new
bootz_run() function to handle this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
diff --git a/boot/bootm.c b/boot/bootm.c
index cce8485..40751a4 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -1140,6 +1140,19 @@
return bootm_run_states(bmi, states);
}
+int bootz_run(struct bootm_info *bmi)
+{
+ int states;
+
+ bmi->cmd_name = "bootz";
+ states = BOOTM_STATE_MEASURE | BOOTM_STATE_OS_PREP |
+ BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO;
+ if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
+ states |= BOOTM_STATE_RAMDISK;
+
+ return bootm_run_states(bmi, states);
+}
+
int bootm_boot_start(ulong addr, const char *cmdline)
{
char addr_str[30];
diff --git a/cmd/bootz.c b/cmd/bootz.c
index 05b15eb..b6bb4aa 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -74,7 +74,7 @@
int do_bootz(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
struct bootm_info bmi;
- int states, ret;
+ int ret;
/* Consume 'bootz' */
argc--; argv++;
@@ -99,12 +99,7 @@
bmi.conf_fdt = argv[2];
bmi.cmd_name = "bootz";
- states = BOOTM_STATE_MEASURE | BOOTM_STATE_OS_PREP |
- BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO;
- if (IS_ENABLED(CONFIG_SYS_BOOT_RAMDISK_HIGH))
- states |= BOOTM_STATE_RAMDISK;
-
- ret = bootm_run_states(&bmi, states);
+ ret = bootz_run(&bmi);
return ret;
}
diff --git a/include/bootm.h b/include/bootm.h
index 6e6b2ad..f7d6d27 100644
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -163,6 +163,19 @@
*/
int bootm_run(struct bootm_info *bmi);
+/**
+ * bootz_run() - Run the entire bootz process
+ *
+ * This runs through the bootz process from start to finish, using the default
+ * set of states.
+ *
+ * This uses bootm_run_states().
+ *
+ * @bmi: bootm information
+ * Return: 0 if ok, something else on error
+ */
+int bootz_run(struct bootm_info *bmi);
+
void arch_preboot_os(void);
/*