sunxi: Enable eMMC on Libre Computer Board ALL-H3-CC boards

[u-boot] / common / bootm.c

diff --git a/common/bootm.c b/common/bootm.c
index 32b3ea8e2d093a203ae67f73ee03a207ba39f212..e517d9f118a8e2bd8c9623725a712a638d9b540d 100644 (file)
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef USE_HOSTCC
@@ -47,6 +46,10 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
                                   char * const argv[], bootm_headers_t *images,
                                   ulong *os_data, ulong *os_len);
 
+__weak void board_quiesce_devices(void)
+{
+}
+
 #ifdef CONFIG_LMB
 static void boot_start_lmb(bootm_headers_t *images)
 {
@@ -199,8 +202,23 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc,
        }
 
        if (images.os.type == IH_TYPE_KERNEL_NOLOAD) {
-               images.os.load = images.os.image_start;
-               images.ep += images.os.load;
+               if (CONFIG_IS_ENABLED(CMD_BOOTI) &&
+                   images.os.arch == IH_ARCH_ARM64) {
+                       ulong image_addr;
+                       ulong image_size;
+
+                       ret = booti_setup(images.os.image_start, &image_addr,
+                                         &image_size, true);
+                       if (ret != 0)
+                               return 1;
+
+                       images.os.type = IH_TYPE_KERNEL;
+                       images.os.load = image_addr;
+                       images.ep = image_addr;
+               } else {
+                       images.os.load = images.os.image_start;
+                       images.ep += images.os.image_start;
+               }
        }
 
        images.os.start = map_to_sysmem(os_hdr);
@@ -248,7 +266,7 @@ int bootm_find_images(int flag, int argc, char * const argv[])
 #endif
 
 #if IMAGE_ENABLE_FIT
-#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_XILINX)
+#if defined(CONFIG_FPGA)
        /* find bitstreams */
        ret = boot_get_fpga(argc, argv, &images, IH_ARCH_DEFAULT,
                            NULL, NULL);
@@ -425,15 +443,17 @@ int bootm_decomp_image(int comp, ulong load, ulong image_start, int type,
 }
 
 #ifndef USE_HOSTCC
-static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
-                        int boot_progress)
+static int bootm_load_os(bootm_headers_t *images, int boot_progress)
 {
        image_info_t os = images->os;
        ulong load = os.load;
+       ulong load_end;
        ulong blob_start = os.start;
        ulong blob_end = os.end;
        ulong image_start = os.image_start;
        ulong image_len = os.image_len;
+       ulong flush_start = ALIGN_DOWN(load, ARCH_DMA_MINALIGN);
+       ulong flush_len;
        bool no_overlap;
        void *load_buf, *image_buf;
        int err;
@@ -442,23 +462,28 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
        image_buf = map_sysmem(os.image_start, image_len);
        err = bootm_decomp_image(os.comp, load, os.image_start, os.type,
                                 load_buf, image_buf, image_len,
-                                CONFIG_SYS_BOOTM_LEN, load_end);
+                                CONFIG_SYS_BOOTM_LEN, &load_end);
        if (err) {
                bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE);
                return err;
        }
-       flush_cache(load, ALIGN(*load_end - load, ARCH_DMA_MINALIGN));
 
-       debug("   kernel loaded at 0x%08lx, end = 0x%08lx\n", load, *load_end);
+       flush_len = load_end - load;
+       if (flush_start < load)
+               flush_len += load - flush_start;
+
+       flush_cache(flush_start, ALIGN(flush_len, ARCH_DMA_MINALIGN));
+
+       debug("   kernel loaded at 0x%08lx, end = 0x%08lx\n", load, load_end);
        bootstage_mark(BOOTSTAGE_ID_KERNEL_LOADED);
 
        no_overlap = (os.comp == IH_COMP_NONE && load == image_start);
 
-       if (!no_overlap && (load < blob_end) && (*load_end > blob_start)) {
+       if (!no_overlap && load < blob_end && load_end > blob_start) {
                debug("images.os.start = 0x%lX, images.os.end = 0x%lx\n",
                      blob_start, blob_end);
                debug("images.os.load = 0x%lx, load_end = 0x%lx\n", load,
-                     *load_end);
+                     load_end);
 
                /* Check what type of image this is. */
                if (images->legacy_hdr_valid) {
@@ -473,6 +498,8 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
                }
        }
 
+       lmb_reserve(&images->lmb, images->os.load, (load_end -
+                                                   images->os.load));
        return 0;
 }
 
@@ -624,14 +651,9 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 
        /* Load the OS */
        if (!ret && (states & BOOTM_STATE_LOADOS)) {
-               ulong load_end;
-
                iflag = bootm_disable_interrupts();
-               ret = bootm_load_os(images, &load_end, 0);
-               if (ret == 0)
-                       lmb_reserve(&images->lmb, images->os.load,
-                                   (load_end - images->os.load));
-               else if (ret && ret != BOOTM_ERR_OVERLAP)
+               ret = bootm_load_os(images, 0);
+               if (ret && ret != BOOTM_ERR_OVERLAP)
                        goto err;
                else if (ret == BOOTM_ERR_OVERLAP)
                        ret = 0;
@@ -810,9 +832,6 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc,
 
        bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);
 
-       /* copy from dataflash if needed */
-       img_addr = genimg_get_image(img_addr);
-
        /* check image type, for FIT images get FIT kernel node */
        *os_data = *os_len = 0;
        buf = map_sysmem(img_addr, 0);