From: Peter Chubb Date: Thu, 8 Sep 2016 20:51:57 +0000 (+0000) Subject: Fix fastboot boot address X-Git-Tag: v2017.09-rc3~51^2~4 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d331084298002e5cc0a54abb5855be1fc69153c3;p=oweals%2Fu-boot.git Fix fastboot boot address Fastboot loads an image at CONFIG_FASTBOOT_BUF_ADDR, but currently tells do_bootm() to look for an image at $loadaddr. This breaks if CONFIG_FASTBOOT_BUF_ADDR is different from the current user-set loadaddr. Instead, tell do_bootm() to pick up the image where it was laoded. Signed-off-by: Peter Chubb Reviewed-by: Tom Rini Acked-by: Steve Rae --- diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index d05b74b2d2..aecee7ff38 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -561,7 +561,7 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) puts("Booting kernel..\n"); - sprintf(boot_addr_start, "0x%lx", load_addr); + sprintf(boot_addr_start, "0x%lx", CONFIG_FASTBOOT_BUF_ADDR); do_bootm(NULL, 0, 2, bootm_args); /* This only happens if image is somehow faulty so we start over */