`flush_start` must be set after `load` has been assigned.

Fixes: 69544c4fd8b1 ("bootm: Support kernel_noload with compression")
Signed-off-by: Nora Schiffer <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
---

v2:
- Rebased onto next
- Collected Reviewed-by

Patch 2/4 from v1 has been dropped, as an alternative solution has been
merged. Whether CONFIG_SYS_BOOTM_LEN should be used for the allocation
size is undecided.


 boot/bootm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boot/bootm.c b/boot/bootm.c
index 4c260a5f5ce..7c9a6f82976 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -618,7 +618,7 @@ static int bootm_load_os(struct bootm_headers *images, int 
boot_progress)
        ulong image_start = os.image_start;
        ulong image_len = os.image_len;
        ulong decomp_len = CONFIG_SYS_BOOTM_LEN;
-       ulong flush_start = ALIGN_DOWN(load, ARCH_DMA_MINALIGN);
+       ulong flush_start;
        bool no_overlap;
        void *load_buf, *image_buf;
        int err;
@@ -663,6 +663,7 @@ static int bootm_load_os(struct bootm_headers *images, int 
boot_progress)
        /* We need the decompressed image size in the next steps */
        images->os.image_len = load_end - load;
 
+       flush_start = ALIGN_DOWN(load, ARCH_DMA_MINALIGN);
        flush_cache(flush_start, ALIGN(load_end, ARCH_DMA_MINALIGN) - 
flush_start);
 
        debug("   kernel loaded at 0x%08lx, end = 0x%08lx\n", load, load_end);
-- 
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
https://www.tq-group.com/

Reply via email to