* argc is adjusted accordingly. This avoids confusion as to how
* many arguments are available for the OS.
* @images: Pointers to os/initrd/fdt
- * @return 1 on error. On success the OS boots so this function does
+ * Return: 1 on error. On success the OS boots so this function does
* not return.
*/
typedef int boot_os_fn(int flag, int argc, char *const argv[],
- bootm_headers_t *images);
+ struct bootm_headers *images);
extern boot_os_fn do_bootm_linux;
extern boot_os_fn do_bootm_vxworks;
int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
-void lynxkdi_boot(image_header_t *hdr);
boot_os_fn *bootm_os_get_boot_func(int os);
#endif
int boot_selected_os(int argc, char *const argv[], int state,
- bootm_headers_t *images, boot_os_fn *boot_fn);
+ struct bootm_headers *images, boot_os_fn *boot_fn);
ulong bootm_disable_interrupts(void);
ulong size);
int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc,
- char *const argv[], int states, bootm_headers_t *images,
+ char *const argv[], int states, struct bootm_headers *images,
int boot_progress);
void arch_preboot_os(void);
*/
void switch_to_non_secure_mode(void);
+/* Flags to control bootm_process_cmdline() */
+enum bootm_cmdline_t {
+ BOOTM_CL_SILENT = 1 << 0, /* Do silent console processing */
+ BOOTM_CL_SUBST = 1 << 1, /* Do substitution */
+
+ BOOTM_CL_ALL = 3, /* All substitutions */
+};
+
/**
* arch_preboot_os() - arch specific configuration before booting
*/
void board_preboot_os(void);
/*
- * fixup_silent_linux() - Process fix-ups for the command line
+ * bootm_process_cmdline() - Process fix-ups for the command line
+ *
+ * This handles:
+ *
+ * - making Linux boot silently if requested ('silent_linux' envvar)
+ * - performing substitutions in the command line ('bootargs_subst' envvar)
+ *
+ * @maxlen must provide enough space for the string being processed plus the
+ * resulting string
+ *
+ * @buf: buffer holding commandline string to adjust
+ * @maxlen: Maximum length of buffer at @buf (including \0)
+ * @flags: Flags to control what happens (see bootm_cmdline_t)
+ * Return: 0 if OK, -ENOMEM if out of memory, -ENOSPC if the commandline is too
+ * long
+ */
+int bootm_process_cmdline(char *buf, int maxlen, int flags);
+
+/**
+ * bootm_process_cmdline_env() - Process fix-ups for the command line
+ *
+ * Updates the 'bootargs' envvar as required. This handles:
*
- * Updates the 'bootargs' envvar as required. This handles making Linux boot
- * silently if requested ('silent_linux' envvar)
+ * - making Linux boot silently if requested ('silent_linux' envvar)
+ * - performing substitutions in the command line ('bootargs_subst' envvar)
*
- * @return 0 if OK, -ENOMEM if out of memory
+ * @flags: Flags to control what happens (see bootm_cmdline_t)
+ * Return: 0 if OK, -ENOMEM if out of memory
*/
-int fixup_silent_linux(void);
+int bootm_process_cmdline_env(int flags);
#endif