x86: zimage: Update cmdline parameter to be an env var

With the updated changes to bootargs substitution[1], the zboot command
needs to be updated to get its command line from an environment variable
instead of a memory address. This is because the command-line string must
be updated to convert %U to ${uuid}, etc.

In any case it is more flexible to use a environment variable and it is
best to do this before the release to avoid a subsequent change.

Update the command accordingly.

[1] http://patchwork.ozlabs.org/project/uboot/list/?series=212481

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 50fb16d2dac45b6eb1a7a300b98e0c084a535e93..24a503d011e982c5903878944c29a5b6ee5cabd2 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -60,8 +60,8 @@
  *     BZIMAGE_LOAD_ADDR or ZIMAGE_LOAD_ADDR
  * @base_ptr: Pointer to the boot parameters, typically at address
  *     DEFAULT_SETUP_BASE
- * @cmdline: Address of 'override' command line, or 0 to use the one in the
- *     setup block
+ * @cmdline: Environment variable containing the 'override' command line, or
+ *     NULL to use the one in the setup block
  */
 struct zboot_state {
        ulong bzimage_addr;
@@ -70,7 +70,7 @@ struct zboot_state {
        ulong initrd_size;
        ulong load_address;
        struct boot_params *base_ptr;
-       ulong cmdline;
+       char *cmdline;
 } state;
 
 enum {
@@ -406,7 +406,7 @@ static int do_zboot_start(struct cmd_tbl *cmdtp, int flag, int argc,
                state.bzimage_addr = 0;
        }
        if (argc >= 7)
-               state.cmdline = simple_strtoul(argv[6], NULL, 16);
+               state.cmdline = env_get(argv[6]);
 
        return 0;
 }
@@ -452,7 +452,7 @@ static int do_zboot_setup(struct cmd_tbl *cmdtp, int flag, int argc,
        }
        ret = setup_zimage(base_ptr, (char *)base_ptr + COMMAND_LINE_OFFSET,
                           0, state.initrd_addr, state.initrd_size,
-                          state.cmdline);
+                          (ulong)state.cmdline);
        if (ret) {
                puts("Setting up boot parameters failed ...\n");
                return CMD_RET_FAILURE;
@@ -743,8 +743,9 @@ U_BOOT_CMDREP_COMPLETE(
        "      initrd size - The size of the initrd image to use, if any.\n"
        "      setup -       The address of the kernel setup region, if this\n"
        "                    is not at addr\n"
-       "      cmdline -     The address of the kernel command line, to\n"
-       "                    override U-Boot's normal cmdline generation\n"
+       "      cmdline -     Environment variable containing the kernel\n"
+       "                    command line, to override U-Boot's normal\n"
+       "                    cmdline generation\n"
        "\n"
        "Sub-commands to do part of the zboot sequence:\n"
        "\tstart [addr [arg ...]] - specify arguments\n"