Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-mpc83xx

[J-u-boot.git] / common / image.c

diff --git a/common/image.c b/common/image.c
index 9badb915f48adea91c2ab2088e518a3ba44ca3d3..75d5dd944ff0487bb0d712b1388c149343ac30fc 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -8,7 +8,9 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#include <cpu_func.h>
 #include <env.h>
+#include <u-boot/crc.h>
 #include <watchdog.h>
 
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
@@ -19,6 +21,7 @@
 
 #include <gzip.h>
 #include <image.h>
+#include <lz4.h>
 #include <mapmem.h>
 
 #if IMAGE_ENABLE_FIT || IMAGE_ENABLE_OF_LIBFDT
@@ -62,7 +65,6 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch,
 
 #include <u-boot/crc.h>
 #include <imximage.h>
-#include <generated/autoconf.h>
 
 #ifndef CONFIG_SYS_BARGSIZE
 #define CONFIG_SYS_BARGSIZE 512
@@ -135,6 +137,7 @@ static const table_entry_t uimage_os[] = {
        {       IH_OS_OPENRTOS, "openrtos",     "OpenRTOS",             },
 #endif
        {       IH_OS_OPENSBI,  "opensbi",      "RISC-V OpenSBI",       },
+       {       IH_OS_EFI,      "efi",          "EFI Firmware" },
 
        {       -1,             "",             "",                     },
 };
@@ -382,7 +385,7 @@ void image_print_contents(const void *ptr)
                printf("HAB Blocks:   0x%08x   0x0000   0x%08x\n",
                        image_get_load(hdr) - image_get_header_size(),
                        (int)(image_get_size(hdr) + image_get_header_size()
-                       + sizeof(flash_header_v2_t) - CONFIG_CSF_SIZE));
+                       + sizeof(flash_header_v2_t) - 0x2060));
        }
 }
 
@@ -584,7 +587,7 @@ ulong env_get_bootm_low(void)
 
 #if defined(CONFIG_SYS_SDRAM_BASE)
        return CONFIG_SYS_SDRAM_BASE;
-#elif defined(CONFIG_ARM)
+#elif defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE)
        return gd->bd->bi_dram[0].start;
 #else
        return 0;
@@ -601,7 +604,8 @@ phys_size_t env_get_bootm_size(void)
                return tmp;
        }
 
-#if defined(CONFIG_ARM) && defined(CONFIG_NR_DRAM_BANKS)
+#if (defined(CONFIG_ARM) || defined(CONFIG_MICROBLAZE)) && \
+     defined(CONFIG_NR_DRAM_BANKS)
        start = gd->bd->bi_dram[0].start;
        size = gd->bd->bi_dram[0].size;
 #else