Convert CONFIG_SYS_MONITOR_BASE to Kconfig

[platform/kernel/u-boot.git] / include / bootm.h

diff --git a/include/bootm.h b/include/bootm.h
index 8d95fb2..7ed5650 100644 (file)
--- a/include/bootm.h
+++ b/include/bootm.h
@@ -29,7 +29,7 @@ struct cmd_tbl;
  *      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[],
@@ -39,7 +39,6 @@ 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);
 
@@ -78,8 +77,9 @@ 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    = 1,            /* All substitutions */
+       BOOTM_CL_ALL    = 3,            /* All substitutions */
 };
 
 /**
@@ -95,7 +95,10 @@ void board_preboot_os(void);
 /*
  * bootm_process_cmdline() - Process fix-ups for the command line
  *
- * This handles: making Linux boot silently if requested ('silent_linux' envvar)
+ * 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
@@ -103,7 +106,7 @@ void board_preboot_os(void);
  * @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
+ * 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);
@@ -111,11 +114,13 @@ 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 making Linux boot
- * silently if requested ('silent_linux' envvar)
+ * Updates the 'bootargs' envvar as required. This handles:
+ *
+ *  - making Linux boot silently if requested ('silent_linux' envvar)
+ *  - performing substitutions in the command line ('bootargs_subst' envvar)
  *
  * @flags: Flags to control what happens (see bootm_cmdline_t)
- * @return 0 if OK, -ENOMEM if out of memory
+ * Return: 0 if OK, -ENOMEM if out of memory
  */
 int bootm_process_cmdline_env(int flags);