aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-02-07 11:30:44 -0600
committerRob Herring <robh@kernel.org>2015-10-05 15:23:49 -0500
commit347d2997e0a48d94fa8650fdba45a06780a867bc (patch)
tree632a3a10584d3be279d028fc5184554c75df2bbe
parent9992fbcb82a341dd15c9edfb646ae5a41c6bc484 (diff)
fastboot: fix boot command by adding dtb address to bootm
Pass the dtb address to the bootm command to fix the fastboot boot command. Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--drivers/usb/gadget/f_fastboot.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 206b6d17ae..f7a4364a7f 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -498,12 +498,14 @@ static void cb_download(struct usb_ep *ep, struct usb_request *req)
static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req)
{
char boot_addr_start[12];
- char *bootm_args[] = { "bootm", boot_addr_start, NULL };
+ char *bootm_args[] = { "bootm", boot_addr_start, "-",
+ NULL, NULL };
+ bootm_args[3] = getenv("fdt_addr_r");
puts("Booting kernel..\n");
sprintf(boot_addr_start, "0x%lx", load_addr);
- do_bootm(NULL, 0, 2, bootm_args);
+ do_bootm(NULL, 0, 4, bootm_args);
/* This only happens if image is somehow faulty so we start over */
do_reset(NULL, 0, 0, NULL);