[U-Boot,v1,1/1] cmd: pxe: Fix bootm argument count
diff mbox series

Message ID 20191119004149.15352-1-vladimir.olovyannikov@broadcom.com
State Accepted
Commit ca326781b4e91ba0a4beaacc6c86b1e1236d7628
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot,v1,1/1] cmd: pxe: Fix bootm argument count
Related show

Commit Message

Vladimir Olovyannikov Nov. 19, 2019, 12:41 a.m. UTC
From: Abhishek Shah <abhishek.shah@broadcom.com>

pxe command parses the init ramfs address(through initrd lable in
pxe config file), but is not passing it to bootm command as argument
as bootm_argc count is not increased.

Signed-off-by: Abhishek Shah <abhishek.shah@broadcom.com>
Signed-off-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
---
 cmd/pxe.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Simon Glass Nov. 19, 2019, 1:21 a.m. UTC | #1
On Mon, 18 Nov 2019 at 16:42, Vladimir Olovyannikov
<vladimir.olovyannikov@broadcom.com> wrote:
>
> From: Abhishek Shah <abhishek.shah@broadcom.com>
>
> pxe command parses the init ramfs address(through initrd lable in
> pxe config file), but is not passing it to bootm command as argument
> as bootm_argc count is not increased.
>
> Signed-off-by: Abhishek Shah <abhishek.shah@broadcom.com>
> Signed-off-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
> ---
>  cmd/pxe.c | 1 +
>  1 file changed, 1 insertion(+)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini Dec. 4, 2019, 4:02 a.m. UTC | #2
On Mon, Nov 18, 2019 at 04:41:49PM -0800, Vladimir Olovyannikov wrote:

> From: Abhishek Shah <abhishek.shah@broadcom.com>
> 
> pxe command parses the init ramfs address(through initrd lable in
> pxe config file), but is not passing it to bootm command as argument
> as bootm_argc count is not increased.
> 
> Signed-off-by: Abhishek Shah <abhishek.shah@broadcom.com>
> Signed-off-by: Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/cmd/pxe.c b/cmd/pxe.c
index 2059975446..768e50aba6 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -663,6 +663,7 @@  static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label)
 		strncpy(bootm_argv[2], env_get("ramdisk_addr_r"), 18);
 		strcat(bootm_argv[2], ":");
 		strncat(bootm_argv[2], env_get("filesize"), 9);
+		bootm_argc = 3;
 	}
 
 	if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) {