]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
fastboot: common: fix default fastboot_boot on 64-bit
authorNeil Armstrong <narmstrong@baylibre.com>
Wed, 20 Feb 2019 10:36:12 +0000 (11:36 +0100)
committerMarek Vasut <marex@denx.de>
Sat, 16 Mar 2019 12:29:43 +0000 (13:29 +0100)
When booting on a 64-bit system, the boot_addr_start buffer is not
large enough to contain a 64-bit number, thus leading to a crash
even if fastboot_buf_addr is valid, only the high part of the address
will be printed to boot_addr_start :

fastboot with fastboot_buf_addr = 0x0000000006000000:
  downloading of 92239872 bytes finished
  Booting kernel at 0x00000000...

  "Synchronous Abort" handler, esr 0x96000004
  elr: 00000000010561f4 lr : 0000000001056fac (reloc)
  <snip>
  x28: 000000007df2d38f x29: 000000007df2d1b0

  Resetting CPU ...

With this fix, boot_addr_start can have the full 64-bit address passed
to bootm.

Fixes: f73a7df984a9 ("net: fastboot: Merge AOSP UDP fastboot")
Cc: Simon Glass <sjg@chromium.org>
Cc: Alex Kiernan <alex.kiernan@gmail.com>
Cc: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/fastboot/fb_common.c

index c6e06aab7aa9434da0ea7dac60464e23744648e1..17eca73be0249f7eb93270f86ad6ba563bce7e0e 100644 (file)
@@ -119,7 +119,7 @@ void fastboot_boot(void)
        if (s) {
                run_command(s, CMD_FLAG_ENV);
        } else {
-               static char boot_addr_start[12];
+               static char boot_addr_start[20];
                static char *const bootm_args[] = {
                        "bootm", boot_addr_start, NULL
                };