spi: fsl_qspi: Fix issues on arm64

[u-boot] / cmd / bootm.c

diff --git a/cmd/bootm.c b/cmd/bootm.c
index 48738ac60524d3b63095a00d6608a66dd1c6aaa0..1bca6fa920ec4d5ed5f5b8919e0a5b47f59d4131 100644 (file)
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -673,6 +673,9 @@ static int booti_setup(bootm_headers_t *images)
         * correct location and then move the image there.
         */
        dst = gd->bd->bi_dram[0].start + le32_to_cpu(ih->text_offset);
+
+       unmap_sysmem(ih);
+
        if (images->ep != dst) {
                void *src;
 
@@ -717,6 +720,8 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
 
        lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size));
 
+       unmap_sysmem(ih);
+
        /*
         * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
         * have a header that provide this informaiton.
@@ -755,15 +760,15 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_SYS_LONGHELP
 static char booti_help_text[] =
        "[addr [initrd[:size]] [fdt]]\n"
-       "    - boot Linux Image stored in memory\n"
+       "    - boot arm64 Linux Image stored in memory\n"
        "\tThe argument 'initrd' is optional and specifies the address\n"
-       "\tof the initrd in memory. The optional argument ':size' allows\n"
-       "\tspecifying the size of RAW initrd.\n"
+       "\tof an initrd in memory. The optional parameter ':size' allows\n"
+       "\tspecifying the size of a RAW initrd.\n"
 #if defined(CONFIG_OF_LIBFDT)
-       "\tSince booting a Linux kernelrequires a flat device-tree\n"
-       "\ta third argument is required which is the address of the\n"
-       "\tdevice-tree blob. To boot that kernel without an initrd image,\n"
-       "\tuse a '-' for the second argument.\n"
+       "\tSince booting a Linux kernel requires a flat device-tree, a\n"
+       "\tthird argument providing the address of the device-tree blob\n"
+       "\tis required. To boot a kernel with a device-tree blob but\n"
+       "\twithout an initrd image, use a '-' for the initrd argument.\n"
 #endif
        "";
 #endif