Created
August 16, 2021 16:13
-
-
Save X547/52df43504acd0b0a749ae30e52f90d13 to your computer and use it in GitHub Desktop.
Haiku build patch for u-boot fdc4fda33051bcb9eb782001afe2bdd3c0d09eae
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 8d73f2a57df2f69cfafa29e623fec275d231f0b2 Mon Sep 17 00:00:00 2001 | |
From: X512 <danger_mail@list.ru> | |
Date: Tue, 17 Aug 2021 01:08:53 +0900 | |
Subject: fix build on Haiku | |
--- | |
arch/arc/lib/bootm.c | 2 +- | |
arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +- | |
arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +- | |
arch/arm/cpu/armv8/sec_firmware.c | 2 +- | |
arch/arm/lib/bootm.c | 2 +- | |
arch/arm/lib/image.c | 2 +- | |
arch/arm/lib/spl.c | 2 +- | |
arch/arm/lib/zimage.c | 2 +- | |
arch/arm/mach-imx/hab.c | 2 +- | |
arch/arm/mach-imx/spl_imx_romapi.c | 2 +- | |
arch/arm/mach-k3/common.c | 2 +- | |
arch/arm/mach-k3/security.c | 2 +- | |
arch/arm/mach-k3/sysfw-loader.c | 2 +- | |
arch/arm/mach-keystone/cmd_mon.c | 2 +- | |
arch/arm/mach-keystone/mon.c | 2 +- | |
arch/arm/mach-mvebu/spl.c | 2 +- | |
arch/arm/mach-rockchip/spl.c | 2 +- | |
arch/arm/mach-socfpga/board.c | 2 +- | |
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h | 2 +- | |
arch/arm/mach-socfpga/spl_a10.c | 2 +- | |
arch/arm/mach-socfpga/spl_agilex.c | 2 +- | |
arch/arm/mach-socfpga/spl_gen5.c | 2 +- | |
arch/arm/mach-socfpga/spl_s10.c | 2 +- | |
arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- | |
arch/arm/mach-stm32mp/dram_init.c | 2 +- | |
arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 +- | |
arch/arm/mach-zynq/spl.c | 2 +- | |
arch/arm/mach-zynqmp/spl.c | 2 +- | |
arch/m68k/lib/bootm.c | 2 +- | |
arch/microblaze/cpu/spl.c | 2 +- | |
arch/microblaze/lib/bootm.c | 2 +- | |
arch/mips/lib/bootm.c | 2 +- | |
arch/mips/mach-jz47xx/jz4780/jz4780.c | 2 +- | |
arch/nds32/lib/bootm.c | 2 +- | |
arch/nios2/lib/bootm.c | 2 +- | |
arch/powerpc/lib/bootm.c | 2 +- | |
arch/powerpc/lib/spl.c | 2 +- | |
arch/riscv/lib/bootm.c | 2 +- | |
arch/riscv/lib/image.c | 2 +- | |
arch/sandbox/lib/bootm.c | 2 +- | |
arch/sh/lib/bootm.c | 2 +- | |
arch/x86/cpu/apollolake/spl.c | 2 +- | |
arch/x86/lib/bootm.c | 2 +- | |
arch/x86/lib/spl.c | 2 +- | |
arch/x86/lib/tpl.c | 2 +- | |
arch/xtensa/lib/bootm.c | 2 +- | |
board/AndesTech/ax25-ae350/ax25-ae350.c | 2 +- | |
board/Arcturus/ucp1020/ucp1020.c | 2 +- | |
board/advantech/imx8qm_rom7720_a1/spl.c | 2 +- | |
board/aristainetos/aristainetos.c | 2 +- | |
board/beacon/imx8mn/spl.c | 2 +- | |
board/compulab/imx8mm-cl-iot-gate/spl.c | 2 +- | |
board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- | |
board/emulation/qemu-riscv/qemu-riscv.c | 2 +- | |
board/engicam/common/spl.c | 2 +- | |
board/freescale/corenet_ds/corenet_ds.c | 2 +- | |
board/freescale/imx8mm_evk/spl.c | 2 +- | |
board/freescale/imx8mn_evk/spl.c | 2 +- | |
board/freescale/imx8mq_evk/spl.c | 2 +- | |
board/freescale/imx8qm_mek/spl.c | 2 +- | |
board/freescale/imx8qxp_mek/spl.c | 2 +- | |
board/freescale/mx6sabreauto/mx6sabreauto.c | 2 +- | |
board/freescale/mx6sabresd/mx6sabresd.c | 2 +- | |
board/freescale/p1010rdb/p1010rdb.c | 2 +- | |
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- | |
board/freescale/p2041rdb/p2041rdb.c | 2 +- | |
board/freescale/t102xrdb/t102xrdb.c | 2 +- | |
board/freescale/t104xrdb/t104xrdb.c | 2 +- | |
board/freescale/t208xqds/t208xqds.c | 2 +- | |
board/freescale/t208xrdb/t208xrdb.c | 2 +- | |
board/freescale/t4rdb/t4240rdb.c | 2 +- | |
board/gateworks/venice/spl.c | 2 +- | |
board/ge/bx50v3/bx50v3.c | 2 +- | |
board/keymile/kmcent2/kmcent2.c | 2 +- | |
board/liebherr/display5/spl.c | 2 +- | |
board/liebherr/mccmon6/spl.c | 2 +- | |
board/mscc/jr2/jr2.c | 2 +- | |
board/mscc/luton/luton.c | 2 +- | |
board/mscc/ocelot/ocelot.c | 2 +- | |
board/mscc/serval/serval.c | 2 +- | |
board/mscc/servalt/servalt.c | 2 +- | |
board/renesas/rcar-common/gen3-spl.c | 2 +- | |
board/renesas/salvator-x/salvator-x.c | 2 +- | |
board/renesas/ulcb/ulcb.c | 2 +- | |
board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- | |
board/sunxi/board.c | 2 +- | |
board/synopsys/hsdk/hsdk.c | 2 +- | |
board/technexion/pico-imx6/spl.c | 2 +- | |
board/ti/am335x/board.c | 2 +- | |
board/ti/am43xx/board.c | 2 +- | |
board/ti/am57xx/board.c | 2 +- | |
board/ti/am65x/evm.c | 2 +- | |
board/ti/dra7xx/evm.c | 2 +- | |
board/ti/j721e/evm.c | 2 +- | |
board/ti/ks2_evm/board.c | 2 +- | |
board/ti/ks2_evm/board_k2e.c | 2 +- | |
board/ti/ks2_evm/board_k2g.c | 2 +- | |
board/ti/ks2_evm/board_k2hk.c | 2 +- | |
board/ti/ks2_evm/board_k2l.c | 2 +- | |
board/toradex/apalis_imx6/apalis_imx6.c | 2 +- | |
board/toradex/verdin-imx8mm/spl.c | 2 +- | |
board/wandboard/wandboard.c | 2 +- | |
board/xilinx/zynqmp/zynqmp.c | 2 +- | |
cmd/abootimg.c | 2 +- | |
cmd/avb.c | 2 +- | |
cmd/bmp.c | 2 +- | |
cmd/bootefi.c | 2 +- | |
cmd/booti.c | 2 +- | |
cmd/bootm.c | 2 +- | |
cmd/bootz.c | 2 +- | |
cmd/cramfs.c | 2 +- | |
cmd/disk.c | 2 +- | |
cmd/elf.c | 2 +- | |
cmd/ext4.c | 2 +- | |
cmd/fdt.c | 2 +- | |
cmd/fpga.c | 2 +- | |
cmd/ide.c | 2 +- | |
cmd/jffs2.c | 2 +- | |
cmd/load.c | 2 +- | |
cmd/md5sum.c | 2 +- | |
cmd/mvebu/bubt.c | 2 +- | |
cmd/nand.c | 2 +- | |
cmd/net.c | 2 +- | |
cmd/optee_rpmb.c | 2 +- | |
cmd/pxe_utils.c | 2 +- | |
cmd/reiser.c | 2 +- | |
cmd/source.c | 2 +- | |
cmd/spl.c | 2 +- | |
cmd/ximg.c | 2 +- | |
cmd/zfs.c | 2 +- | |
common/avb_verify.c | 2 +- | |
common/board_r.c | 2 +- | |
common/boot_fit.c | 2 +- | |
common/bootm.c | 2 +- | |
common/bootm_os.c | 2 +- | |
common/common_fit.c | 2 +- | |
common/hash.c | 2 +- | |
common/image-android.c | 2 +- | |
common/image-cipher.c | 2 +- | |
common/image-fdt.c | 2 +- | |
common/image-fit-sig.c | 2 +- | |
common/image-fit.c | 2 +- | |
common/image-sig.c | 2 +- | |
common/image.c | 4 ++-- | |
common/lynxkdi.c | 2 +- | |
common/spl/spl.c | 2 +- | |
common/spl/spl_atf.c | 2 +- | |
common/spl/spl_ext.c | 2 +- | |
common/spl/spl_fat.c | 2 +- | |
common/spl/spl_fit.c | 2 +- | |
common/spl/spl_legacy.c | 2 +- | |
common/spl/spl_mmc.c | 2 +- | |
common/spl/spl_nand.c | 2 +- | |
common/spl/spl_net.c | 2 +- | |
common/spl/spl_nor.c | 2 +- | |
common/spl/spl_onenand.c | 2 +- | |
common/spl/spl_opensbi.c | 2 +- | |
common/spl/spl_ram.c | 2 +- | |
common/spl/spl_sata.c | 2 +- | |
common/spl/spl_spi.c | 2 +- | |
common/spl/spl_ubi.c | 2 +- | |
common/spl/spl_xip.c | 2 +- | |
common/spl/spl_ymodem.c | 2 +- | |
common/splash_source.c | 2 +- | |
common/update.c | 2 +- | |
drivers/fastboot/fb_mmc.c | 2 +- | |
drivers/fpga/socfpga_arria10.c | 2 +- | |
drivers/net/fsl-mc/mc.c | 2 +- | |
drivers/net/pfe_eth/pfe_firmware.c | 2 +- | |
drivers/usb/gadget/f_sdp.c | 2 +- | |
include/bootm.h | 2 +- | |
include/compiler.h | 5 +++++ | |
include/efi_loader.h | 2 +- | |
include/{image.h => image2.h} | 0 | |
include/imx8image.h | 2 +- | |
include/tee/optee.h | 2 +- | |
include/u-boot/aes.h | 2 +- | |
include/u-boot/ecdsa.h | 2 +- | |
include/u-boot/hash-checksum.h | 2 +- | |
include/u-boot/rsa-mod-exp.h | 2 +- | |
include/u-boot/rsa.h | 2 +- | |
lib/aes/aes-decrypt.c | 2 +- | |
lib/aes/aes-encrypt.c | 2 +- | |
lib/crypto/pkcs7_verify.c | 2 +- | |
lib/crypto/public_key.c | 2 +- | |
lib/crypto/x509_public_key.c | 2 +- | |
lib/efi_loader/efi_firmware.c | 2 +- | |
lib/efi_loader/efi_signature.c | 2 +- | |
lib/gunzip.c | 2 +- | |
lib/gzip.c | 2 +- | |
lib/hash-checksum.c | 2 +- | |
lib/lmb.c | 2 +- | |
lib/lz4_wrapper.c | 2 +- | |
lib/optee/optee.c | 2 +- | |
lib/rsa/rsa-keyprop.c | 2 +- | |
lib/rsa/rsa-sign.c | 2 +- | |
net/net.c | 2 +- | |
net/nfs.c | 2 +- | |
net/tftp.c | 2 +- | |
test/compression.c | 2 +- | |
test/image/spl_load.c | 2 +- | |
test/lib/rsa.c | 2 +- | |
test/overlay/cmd_ut_overlay.c | 2 +- | |
tools/aisimage.c | 2 +- | |
tools/atmelimage.c | 2 +- | |
tools/default_image.c | 2 +- | |
tools/dumpimage.c | 2 +- | |
tools/fit_check_sign.c | 2 +- | |
tools/fit_common.c | 2 +- | |
tools/fit_common.h | 2 +- | |
tools/fit_image.c | 2 +- | |
tools/fit_info.c | 2 +- | |
tools/gpimage-common.c | 2 +- | |
tools/gpimage.c | 2 +- | |
tools/image-host.c | 2 +- | |
tools/image-sig-host.c | 2 +- | |
tools/imagetool.c | 2 +- | |
tools/imx8image.c | 2 +- | |
tools/imx8mimage.c | 2 +- | |
tools/imximage.c | 2 +- | |
tools/kwbimage.c | 2 +- | |
tools/kwboot.c | 2 +- | |
tools/lpc32xximage.c | 2 +- | |
tools/mkimage.c | 2 +- | |
tools/mtk_image.c | 2 +- | |
tools/mxsimage.c | 2 +- | |
tools/omapimage.c | 2 +- | |
tools/pblimage.c | 2 +- | |
tools/rkcommon.c | 2 +- | |
tools/rkimage.c | 2 +- | |
tools/rksd.c | 2 +- | |
tools/rkspi.c | 2 +- | |
tools/socfpgaimage.c | 2 +- | |
tools/stm32image.c | 2 +- | |
tools/sunxi_egon.c | 2 +- | |
tools/ublimage.c | 2 +- | |
tools/vybridimage.c | 2 +- | |
tools/zynqimage.c | 2 +- | |
tools/zynqmpbif.c | 2 +- | |
tools/zynqmpimage.c | 2 +- | |
240 files changed, 244 insertions(+), 239 deletions(-) | |
rename include/{image.h => image2.h} (100%) | |
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c | |
index 8a8d394a5f..0f8a0e9e6a 100644 | |
--- a/arch/arc/lib/bootm.c | |
+++ b/arch/arc/lib/bootm.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <bootstage.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <irq_func.h> | |
#include <lmb.h> | |
#include <log.h> | |
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c | |
index 730d7663d0..4af2a7c95a 100644 | |
--- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c | |
+++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/cache.h> | |
#include <asm/global_data.h> | |
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c | |
index 1d5e344452..305c7aea82 100644 | |
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c | |
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c | |
@@ -9,7 +9,7 @@ | |
#include <debug_uart.h> | |
#include <env.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c | |
index 267894fbcb..a67d988540 100644 | |
--- a/arch/arm/cpu/armv8/sec_firmware.c | |
+++ b/arch/arm/cpu/armv8/sec_firmware.c | |
@@ -7,7 +7,7 @@ | |
#include <cpu_func.h> | |
#include <errno.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/cache.h> | |
#include <asm/global_data.h> | |
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c | |
index f60ee3a7e6..638f533bac 100644 | |
--- a/arch/arm/lib/bootm.c | |
+++ b/arch/arm/lib/bootm.c | |
@@ -21,7 +21,7 @@ | |
#include <asm/global_data.h> | |
#include <dm/root.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/zlib.h> | |
#include <asm/byteorder.h> | |
#include <linux/libfdt.h> | |
diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c | |
index e394c1ad90..c1800658b0 100644 | |
--- a/arch/arm/lib/image.c | |
+++ b/arch/arm/lib/image.c | |
@@ -5,7 +5,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mapmem.h> | |
#include <asm/global_data.h> | |
#include <linux/bitops.h> | |
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c | |
index 8e2bdf3536..f5c018cda8 100644 | |
--- a/arch/arm/lib/spl.c | |
+++ b/arch/arm/lib/spl.c | |
@@ -12,7 +12,7 @@ | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/cache.h> | |
#include <asm/global_data.h> | |
#include <linux/compiler.h> | |
diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c | |
index 45e9c4506a..680585a396 100644 | |
--- a/arch/arm/lib/zimage.c | |
+++ b/arch/arm/lib/zimage.c | |
@@ -7,7 +7,7 @@ | |
* Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com> | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 | |
#define BAREBOX_IMAGE_MAGIC 0x00786f62 | |
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c | |
index cc39e6bf56..4ecac242fd 100644 | |
--- a/arch/arm/mach-imx/hab.c | |
+++ b/arch/arm/mach-imx/hab.c | |
@@ -8,7 +8,7 @@ | |
#include <config.h> | |
#include <fuse.h> | |
#include <mapmem.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/io.h> | |
#include <asm/global_data.h> | |
#include <asm/system.h> | |
diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c | |
index d827de375a..93e42c281a 100644 | |
--- a/arch/arm/mach-imx/spl_imx_romapi.c | |
+++ b/arch/arm/mach-imx/spl_imx_romapi.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
#include <linux/libfdt.h> | |
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c | |
index bb0f64194f..aef6db82a8 100644 | |
--- a/arch/arm/mach-k3/common.c | |
+++ b/arch/arm/mach-k3/common.c | |
@@ -8,7 +8,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c | |
index 8de9739a40..eb18b0de5a 100644 | |
--- a/arch/arm/mach-k3/security.c | |
+++ b/arch/arm/mach-k3/security.c | |
@@ -10,7 +10,7 @@ | |
#include <cpu_func.h> | |
#include <dm.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/cache.h> | |
#include <linux/soc/ti/ti_sci_protocol.h> | |
diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c | |
index d213e06afb..b578f4c9cc 100644 | |
--- a/arch/arm/mach-k3/sysfw-loader.c | |
+++ b/arch/arm/mach-k3/sysfw-loader.c | |
@@ -8,7 +8,7 @@ | |
#include <common.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <malloc.h> | |
diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c | |
index e26296b6da..d03de74045 100644 | |
--- a/arch/arm/mach-keystone/cmd_mon.c | |
+++ b/arch/arm/mach-keystone/cmd_mon.c | |
@@ -8,7 +8,7 @@ | |
#include <common.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mach/mon.h> | |
asm(".arch_extension sec\n\t"); | |
diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c | |
index b863bab196..9573291555 100644 | |
--- a/arch/arm/mach-keystone/mon.c | |
+++ b/arch/arm/mach-keystone/mon.c | |
@@ -6,7 +6,7 @@ | |
*/ | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/unaligned.h> | |
#include <common.h> | |
#include <command.h> | |
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c | |
index f0cf60bb14..a05e303d30 100644 | |
--- a/arch/arm/mach-mvebu/spl.c | |
+++ b/arch/arm/mach-mvebu/spl.c | |
@@ -8,7 +8,7 @@ | |
#include <debug_uart.h> | |
#include <fdtdec.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c | |
index 02c40fb37e..32d6e8cfeb 100644 | |
--- a/arch/arm/mach-rockchip/spl.c | |
+++ b/arch/arm/mach-rockchip/spl.c | |
@@ -7,7 +7,7 @@ | |
#include <debug_uart.h> | |
#include <dm.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <ram.h> | |
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c | |
index 36eecdc057..d5ba8cb03b 100644 | |
--- a/arch/arm/mach-socfpga/board.c | |
+++ b/arch/arm/mach-socfpga/board.c | |
@@ -15,7 +15,7 @@ | |
#include <errno.h> | |
#include <fdtdec.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <usb.h> | |
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h | |
index 048708202c..8a3b7a00fb 100644 | |
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h | |
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h | |
@@ -6,7 +6,7 @@ | |
#include <asm/cache.h> | |
#include <altera.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/bitops.h> | |
#ifndef _FPGA_MANAGER_ARRIA10_H_ | |
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c | |
index b5f43f09d1..e2c2cb0f89 100644 | |
--- a/arch/arm/mach-socfpga/spl_a10.c | |
+++ b/arch/arm/mach-socfpga/spl_a10.c | |
@@ -12,7 +12,7 @@ | |
#include <asm/pl310.h> | |
#include <asm/u-boot.h> | |
#include <asm/utils.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/arch/reset_manager.h> | |
#include <spl.h> | |
#include <asm/arch/system_manager.h> | |
diff --git a/arch/arm/mach-socfpga/spl_agilex.c b/arch/arm/mach-socfpga/spl_agilex.c | |
index ee5a9dc1e2..585040ba22 100644 | |
--- a/arch/arm/mach-socfpga/spl_agilex.c | |
+++ b/arch/arm/mach-socfpga/spl_agilex.c | |
@@ -12,7 +12,7 @@ | |
#include <asm/utils.h> | |
#include <common.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <spl.h> | |
#include <asm/arch/clock_manager.h> | |
#include <asm/arch/firewall.h> | |
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c | |
index 7c71611768..d34ae0ec41 100644 | |
--- a/arch/arm/mach-socfpga/spl_gen5.c | |
+++ b/arch/arm/mach-socfpga/spl_gen5.c | |
@@ -11,7 +11,7 @@ | |
#include <asm/io.h> | |
#include <asm/u-boot.h> | |
#include <asm/utils.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/arch/reset_manager.h> | |
#include <spl.h> | |
#include <asm/arch/system_manager.h> | |
diff --git a/arch/arm/mach-socfpga/spl_s10.c b/arch/arm/mach-socfpga/spl_s10.c | |
index c20e87cdbe..19d35d7666 100644 | |
--- a/arch/arm/mach-socfpga/spl_s10.c | |
+++ b/arch/arm/mach-socfpga/spl_s10.c | |
@@ -13,7 +13,7 @@ | |
#include <asm/utils.h> | |
#include <common.h> | |
#include <debug_uart.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <spl.h> | |
#include <asm/arch/clock_manager.h> | |
#include <asm/arch/firewall.h> | |
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | |
index be53a52977..eabe95f9bc 100644 | |
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | |
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <dfu.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/arch/stm32prog.h> | |
#include "stm32prog.h" | |
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c | |
index 3c097029bd..bb19a8cd39 100644 | |
--- a/arch/arm/mach-stm32mp/dram_init.c | |
+++ b/arch/arm/mach-stm32mp/dram_init.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <lmb.h> | |
#include <log.h> | |
diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c | |
index 15e86cbac8..6b7d8dfebe 100644 | |
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c | |
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <asm/gpio.h> | |
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c | |
index d09141c3bc..679d2343a5 100644 | |
--- a/arch/arm/mach-zynq/spl.c | |
+++ b/arch/arm/mach-zynq/spl.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <debug_uart.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c | |
index 8fcae2c6a6..c57fadc57c 100644 | |
--- a/arch/arm/mach-zynqmp/spl.c | |
+++ b/arch/arm/mach-zynqmp/spl.c | |
@@ -6,7 +6,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c | |
index 51a6f93858..4d92412922 100644 | |
--- a/arch/m68k/lib/bootm.c | |
+++ b/arch/m68k/lib/bootm.c | |
@@ -8,7 +8,7 @@ | |
#include <bootstage.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c | |
index 86522f8447..379c3c706c 100644 | |
--- a/arch/microblaze/cpu/spl.c | |
+++ b/arch/microblaze/cpu/spl.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <asm/io.h> | |
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c | |
index 6695ac63c7..0ec2c3aae6 100644 | |
--- a/arch/microblaze/lib/bootm.c | |
+++ b/arch/microblaze/lib/bootm.c | |
@@ -14,7 +14,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <asm/cache.h> | |
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c | |
index fde90fced4..8c81139cc7 100644 | |
--- a/arch/mips/lib/bootm.c | |
+++ b/arch/mips/lib/bootm.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <bootstage.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <fdt_support.h> | |
#include <lmb.h> | |
#include <log.h> | |
diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c | |
index fefba12873..ad8c36ee9d 100644 | |
--- a/arch/mips/mach-jz47xx/jz4780/jz4780.c | |
+++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c | |
@@ -10,7 +10,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/global_data.h> | |
#include <asm/io.h> | |
diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c | |
index 4cb0f530ae..cb38e24c6b 100644 | |
--- a/arch/nds32/lib/bootm.c | |
+++ b/arch/nds32/lib/bootm.c | |
@@ -10,7 +10,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
#include <u-boot/zlib.h> | |
diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c | |
index 5037467151..c0deeed315 100644 | |
--- a/arch/nios2/lib/bootm.c | |
+++ b/arch/nios2/lib/bootm.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <irq_func.h> | |
#include <log.h> | |
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c | |
index 31c17b5bb3..3bcc4bee6e 100644 | |
--- a/arch/powerpc/lib/bootm.c | |
+++ b/arch/powerpc/lib/bootm.c | |
@@ -16,7 +16,7 @@ | |
#include <log.h> | |
#include <watchdog.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <asm/global_data.h> | |
#include <u-boot/zlib.h> | |
diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c | |
index d4a6057527..a0e0782115 100644 | |
--- a/arch/powerpc/lib/spl.c | |
+++ b/arch/powerpc/lib/spl.c | |
@@ -6,7 +6,7 @@ | |
#include <config.h> | |
#include <log.h> | |
#include <spl.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/compiler.h> | |
/* | |
diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c | |
index 8dd1820540..75e0bd1a93 100644 | |
--- a/arch/riscv/lib/bootm.c | |
+++ b/arch/riscv/lib/bootm.c | |
@@ -15,7 +15,7 @@ | |
#include <log.h> | |
#include <asm/global_data.h> | |
#include <dm/root.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/byteorder.h> | |
#include <asm/csr.h> | |
#include <asm/smp.h> | |
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c | |
index a65a5b8d17..062be383e4 100644 | |
--- a/arch/riscv/lib/image.c | |
+++ b/arch/riscv/lib/image.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mapmem.h> | |
#include <errno.h> | |
#include <asm/global_data.h> | |
diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c | |
index d1d460b84a..707ebfca63 100644 | |
--- a/arch/sandbox/lib/bootm.c | |
+++ b/arch/sandbox/lib/bootm.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <bootstage.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/io.h> | |
#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 | |
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c | |
index dc94f83785..6a67719a6d 100644 | |
--- a/arch/sh/lib/bootm.c | |
+++ b/arch/sh/lib/bootm.c | |
@@ -10,7 +10,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/byteorder.h> | |
#include <asm/zimage.h> | |
diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c | |
index f2d25734c6..9dda787e39 100644 | |
--- a/arch/x86/cpu/apollolake/spl.c | |
+++ b/arch/x86/cpu/apollolake/spl.c | |
@@ -9,7 +9,7 @@ | |
#include <binman_sym.h> | |
#include <bootstage.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <spi.h> | |
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c | |
index 733dd71257..99001a8533 100644 | |
--- a/arch/x86/lib/bootm.c | |
+++ b/arch/x86/lib/bootm.c | |
@@ -17,7 +17,7 @@ | |
#include <dm/root.h> | |
#include <errno.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/zlib.h> | |
#include <asm/bootparam.h> | |
#include <asm/cpu.h> | |
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c | |
index b18c1cd609..f74b69e098 100644 | |
--- a/arch/x86/lib/spl.c | |
+++ b/arch/x86/lib/spl.c | |
@@ -8,7 +8,7 @@ | |
#include <debug_uart.h> | |
#include <dm.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <irq_func.h> | |
#include <log.h> | |
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c | |
index b3e5f9c913..645ff3a69e 100644 | |
--- a/arch/x86/lib/tpl.c | |
+++ b/arch/x86/lib/tpl.c | |
@@ -7,7 +7,7 @@ | |
#include <debug_uart.h> | |
#include <dm.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c | |
index bb1e2886ab..5d123f55bb 100644 | |
--- a/arch/xtensa/lib/bootm.c | |
+++ b/arch/xtensa/lib/bootm.c | |
@@ -15,7 +15,7 @@ | |
#include <asm/addrspace.h> | |
#include <asm/bootparam.h> | |
#include <asm/cache.h> | |
-#include <image.h> | |
+#include <image2.h> | |
DECLARE_GLOBAL_DATA_PTR; | |
diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c | |
index 81b0ee9923..2e02b4f387 100644 | |
--- a/board/AndesTech/ax25-ae350/ax25-ae350.c | |
+++ b/board/AndesTech/ax25-ae350/ax25-ae350.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <flash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) | |
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c | |
index ee8a9e0a5e..6b92fc6f7c 100644 | |
--- a/board/Arcturus/ucp1020/ucp1020.c | |
+++ b/board/Arcturus/ucp1020/ucp1020.c | |
@@ -12,7 +12,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <hwconfig.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <pci.h> | |
diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c | |
index 8493bb0158..12aa72f07e 100644 | |
--- a/board/advantech/imx8qm_rom7720_a1/spl.c | |
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c | |
index f13fa11637..9986409770 100644 | |
--- a/board/aristainetos/aristainetos.c | |
+++ b/board/aristainetos/aristainetos.c | |
@@ -10,7 +10,7 @@ | |
*/ | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/clock.h> | |
#include <asm/arch/imx-regs.h> | |
diff --git a/board/beacon/imx8mn/spl.c b/board/beacon/imx8mn/spl.c | |
index b5263ccfd7..b1c1b8fc29 100644 | |
--- a/board/beacon/imx8mn/spl.c | |
+++ b/board/beacon/imx8mn/spl.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/io.h> | |
diff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c | |
index 8f592457d4..d13cb93cfc 100644 | |
--- a/board/compulab/imx8mm-cl-iot-gate/spl.c | |
+++ b/board/compulab/imx8mm-cl-iot-gate/spl.c | |
@@ -8,7 +8,7 @@ | |
#include <command.h> | |
#include <cpu_func.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c | |
index 2969e90a70..904fe39db8 100644 | |
--- a/board/dhelectronics/dh_imx6/dh_imx6.c | |
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c | |
@@ -8,7 +8,7 @@ | |
#include <common.h> | |
#include <dm.h> | |
#include <eeprom.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <asm/global_data.h> | |
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c | |
index dcfd3f20be..a9fc8acf9c 100644 | |
--- a/board/emulation/qemu-riscv/qemu-riscv.c | |
+++ b/board/emulation/qemu-riscv/qemu-riscv.c | |
@@ -7,7 +7,7 @@ | |
#include <dm.h> | |
#include <env.h> | |
#include <fdtdec.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <init.h> | |
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c | |
index 6a0612481a..b8f8f35426 100644 | |
--- a/board/engicam/common/spl.c | |
+++ b/board/engicam/common/spl.c | |
@@ -6,7 +6,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <serial.h> | |
#include <spl.h> | |
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c | |
index 3a83e65f2f..af0a5e736c 100644 | |
--- a/board/freescale/corenet_ds/corenet_ds.c | |
+++ b/board/freescale/corenet_ds/corenet_ds.c | |
@@ -7,7 +7,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <netdev.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c | |
index 4ef7f6f180..a9ae366088 100644 | |
--- a/board/freescale/imx8mm_evk/spl.c | |
+++ b/board/freescale/imx8mm_evk/spl.c | |
@@ -7,7 +7,7 @@ | |
#include <command.h> | |
#include <cpu_func.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c | |
index 03f2a56e80..5e5170f299 100644 | |
--- a/board/freescale/imx8mn_evk/spl.c | |
+++ b/board/freescale/imx8mn_evk/spl.c | |
@@ -8,7 +8,7 @@ | |
#include <command.h> | |
#include <cpu_func.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c | |
index e8e0efe485..83545a3bfe 100644 | |
--- a/board/freescale/imx8mq_evk/spl.c | |
+++ b/board/freescale/imx8mq_evk/spl.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c | |
index 944ba745c0..8c6e80d4af 100644 | |
--- a/board/freescale/imx8qm_mek/spl.c | |
+++ b/board/freescale/imx8qm_mek/spl.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c | |
index ae6b64ff6e..bb8e8a6f43 100644 | |
--- a/board/freescale/imx8qxp_mek/spl.c | |
+++ b/board/freescale/imx8qxp_mek/spl.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c | |
index e92ef26d0a..883d8f7f9c 100644 | |
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c | |
+++ b/board/freescale/mx6sabreauto/mx6sabreauto.c | |
@@ -6,7 +6,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c | |
index 8c35230855..50d4db7b80 100644 | |
--- a/board/freescale/mx6sabresd/mx6sabresd.c | |
+++ b/board/freescale/mx6sabresd/mx6sabresd.c | |
@@ -5,7 +5,7 @@ | |
* Author: Fabio Estevam <fabio.estevam@freescale.com> | |
*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <asm/arch/clock.h> | |
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c | |
index 84fc891b67..833e811c92 100644 | |
--- a/board/freescale/p1010rdb/p1010rdb.c | |
+++ b/board/freescale/p1010rdb/p1010rdb.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | |
index 19ece12296..bb3862792a 100644 | |
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | |
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | |
@@ -9,7 +9,7 @@ | |
#include <env.h> | |
#include <hang.h> | |
#include <hwconfig.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <pci.h> | |
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c | |
index 4ece1e6ea0..3eabc5cb6d 100644 | |
--- a/board/freescale/p2041rdb/p2041rdb.c | |
+++ b/board/freescale/p2041rdb/p2041rdb.c | |
@@ -7,7 +7,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <netdev.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c | |
index 51a36abe36..70cff6fc5a 100644 | |
--- a/board/freescale/t102xrdb/t102xrdb.c | |
+++ b/board/freescale/t102xrdb/t102xrdb.c | |
@@ -9,7 +9,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <i2c.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <netdev.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c | |
index 780043483d..2e4f6bc2a3 100644 | |
--- a/board/freescale/t104xrdb/t104xrdb.c | |
+++ b/board/freescale/t104xrdb/t104xrdb.c | |
@@ -8,7 +8,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <hwconfig.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <netdev.h> | |
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c | |
index 715de106d6..2eb394a283 100644 | |
--- a/board/freescale/t208xqds/t208xqds.c | |
+++ b/board/freescale/t208xqds/t208xqds.c | |
@@ -9,7 +9,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <i2c.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <netdev.h> | |
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c | |
index 1f0cdee0b8..2120458f3f 100644 | |
--- a/board/freescale/t208xrdb/t208xrdb.c | |
+++ b/board/freescale/t208xrdb/t208xrdb.c | |
@@ -9,7 +9,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <i2c.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <netdev.h> | |
#include <asm/global_data.h> | |
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c | |
index 6ab35ca918..c4734db042 100644 | |
--- a/board/freescale/t4rdb/t4240rdb.c | |
+++ b/board/freescale/t4rdb/t4240rdb.c | |
@@ -8,7 +8,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <i2c.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <netdev.h> | |
#include <asm/global_data.h> | |
diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c | |
index b819c6846d..4bc36e1425 100644 | |
--- a/board/gateworks/venice/spl.c | |
+++ b/board/gateworks/venice/spl.c | |
@@ -7,7 +7,7 @@ | |
#include <cpu_func.h> | |
#include <hang.h> | |
#include <i2c.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c | |
index 7fcebba026..a37d61104d 100644 | |
--- a/board/ge/bx50v3/bx50v3.c | |
+++ b/board/ge/bx50v3/bx50v3.c | |
@@ -5,7 +5,7 @@ | |
* Copyright 2012 Freescale Semiconductor, Inc. | |
*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/clock.h> | |
#include <asm/arch/imx-regs.h> | |
diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c | |
index 4f5164e63c..a8b47dc72d 100644 | |
--- a/board/keymile/kmcent2/kmcent2.c | |
+++ b/board/keymile/kmcent2/kmcent2.c | |
@@ -18,7 +18,7 @@ | |
#include <fdt_support.h> | |
#include <fm_eth.h> | |
#include <hwconfig.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/compiler.h> | |
#include <net.h> | |
#include <netdev.h> | |
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c | |
index 39f70f578e..1cf8365232 100644 | |
--- a/board/liebherr/display5/spl.c | |
+++ b/board/liebherr/display5/spl.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <serial.h> | |
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c | |
index 56eae3b4e9..bf13576105 100644 | |
--- a/board/liebherr/mccmon6/spl.c | |
+++ b/board/liebherr/mccmon6/spl.c | |
@@ -5,7 +5,7 @@ | |
* Richard Hu <hakahu@gmail.com> | |
*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/clock.h> | |
#include <asm/arch/imx-regs.h> | |
diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c | |
index 1c516aacd8..07484b5de8 100644 | |
--- a/board/mscc/jr2/jr2.c | |
+++ b/board/mscc/jr2/jr2.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/io.h> | |
#include <led.h> | |
diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c | |
index 038902d08a..9b8422266c 100644 | |
--- a/board/mscc/luton/luton.c | |
+++ b/board/mscc/luton/luton.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/global_data.h> | |
#include <asm/io.h> | |
diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c | |
index c462890bb8..acaeecaaa5 100644 | |
--- a/board/mscc/ocelot/ocelot.c | |
+++ b/board/mscc/ocelot/ocelot.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c | |
index 94c1c42b79..29609c5214 100644 | |
--- a/board/mscc/serval/serval.c | |
+++ b/board/mscc/serval/serval.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/global_data.h> | |
#include <asm/io.h> | |
diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c | |
index 252d8e3156..7e91bc7f86 100644 | |
--- a/board/mscc/servalt/servalt.c | |
+++ b/board/mscc/servalt/servalt.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/global_data.h> | |
#include <asm/io.h> | |
diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c | |
index b02a946a21..4059f507c3 100644 | |
--- a/board/renesas/rcar-common/gen3-spl.c | |
+++ b/board/renesas/rcar-common/gen3-spl.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/io.h> | |
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c | |
index d4752e5798..1dfe2253f6 100644 | |
--- a/board/renesas/salvator-x/salvator-x.c | |
+++ b/board/renesas/salvator-x/salvator-x.c | |
@@ -9,7 +9,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <malloc.h> | |
#include <netdev.h> | |
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c | |
index 4626d223b0..4550d5acae 100644 | |
--- a/board/renesas/ulcb/ulcb.c | |
+++ b/board/renesas/ulcb/ulcb.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <malloc.h> | |
#include <netdev.h> | |
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c | |
index 6207bf8253..4cb1d371da 100644 | |
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c | |
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c | |
@@ -14,7 +14,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/arch/clock.h> | |
diff --git a/board/sunxi/board.c b/board/sunxi/board.c | |
index 1a46100e40..cb8520314b 100644 | |
--- a/board/sunxi/board.c | |
+++ b/board/sunxi/board.c | |
@@ -14,7 +14,7 @@ | |
#include <dm.h> | |
#include <env.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <mmc.h> | |
diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c | |
index 892b94bb08..6b488f3f9d 100644 | |
--- a/board/synopsys/hsdk/hsdk.c | |
+++ b/board/synopsys/hsdk/hsdk.c | |
@@ -9,7 +9,7 @@ | |
#include <config.h> | |
#include <cpu_func.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <irq_func.h> | |
#include <log.h> | |
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c | |
index 3b36bb8df1..c154c47826 100644 | |
--- a/board/technexion/pico-imx6/spl.c | |
+++ b/board/technexion/pico-imx6/spl.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/clock.h> | |
#include <asm/arch/imx-regs.h> | |
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c | |
index 2e4f3d102b..535b9934a2 100644 | |
--- a/board/ti/am335x/board.c | |
+++ b/board/ti/am335x/board.c | |
@@ -11,7 +11,7 @@ | |
#include <dm.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <malloc.h> | |
#include <net.h> | |
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c | |
index a71b588efc..ecbeeb422a 100644 | |
--- a/board/ti/am43xx/board.c | |
+++ b/board/ti/am43xx/board.c | |
@@ -9,7 +9,7 @@ | |
#include <common.h> | |
#include <eeprom.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/global_data.h> | |
#include <dm/uclass.h> | |
#include <env.h> | |
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c | |
index 399a2e5d91..04d1e4eccd 100644 | |
--- a/board/ti/am57xx/board.c | |
+++ b/board/ti/am57xx/board.c | |
@@ -11,7 +11,7 @@ | |
#include <env.h> | |
#include <fastboot.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <malloc.h> | |
#include <net.h> | |
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c | |
index fbe33cbea5..d2bcb5e3f9 100644 | |
--- a/board/ti/am65x/evm.c | |
+++ b/board/ti/am65x/evm.c | |
@@ -10,7 +10,7 @@ | |
#include <common.h> | |
#include <dm.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <asm/arch/sys_proto.h> | |
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c | |
index 23e8005991..dff72e136d 100644 | |
--- a/board/ti/dra7xx/evm.c | |
+++ b/board/ti/dra7xx/evm.c | |
@@ -13,7 +13,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <fastboot.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <spl.h> | |
#include <net.h> | |
diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c | |
index 077d83420c..8902b0893c 100644 | |
--- a/board/ti/j721e/evm.c | |
+++ b/board/ti/j721e/evm.c | |
@@ -11,7 +11,7 @@ | |
#include <env.h> | |
#include <fdt_support.h> | |
#include <generic-phy.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <net.h> | |
diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c | |
index 0c5c2c9146..8e59d448cd 100644 | |
--- a/board/ti/ks2_evm/board.c | |
+++ b/board/ti/ks2_evm/board.c | |
@@ -11,7 +11,7 @@ | |
#include "board.h" | |
#include <env.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <spl.h> | |
#include <exports.h> | |
diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c | |
index 39abb24e15..d2be8eba61 100644 | |
--- a/board/ti/ks2_evm/board_k2e.c | |
+++ b/board/ti/ks2_evm/board_k2e.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/ddr3.h> | |
#include <asm/arch/hardware.h> | |
diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c | |
index 5229afad63..fe2d941413 100644 | |
--- a/board/ti/ks2_evm/board_k2g.c | |
+++ b/board/ti/ks2_evm/board_k2g.c | |
@@ -9,7 +9,7 @@ | |
#include <eeprom.h> | |
#include <env.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/clock.h> | |
#include <asm/ti-common/keystone_net.h> | |
diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c | |
index 12c4649c3c..5ca0c39943 100644 | |
--- a/board/ti/ks2_evm/board_k2hk.c | |
+++ b/board/ti/ks2_evm/board_k2hk.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/clock.h> | |
#include <asm/arch/hardware.h> | |
diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c | |
index f759ee3646..92f2869fdf 100644 | |
--- a/board/ti/ks2_evm/board_k2l.c | |
+++ b/board/ti/ks2_evm/board_k2l.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <asm/arch/ddr3.h> | |
#include <asm/arch/hardware.h> | |
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c | |
index 74060daadd..0d736bbc56 100644 | |
--- a/board/toradex/apalis_imx6/apalis_imx6.c | |
+++ b/board/toradex/apalis_imx6/apalis_imx6.c | |
@@ -9,7 +9,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
#include <dm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <net.h> | |
#include <asm/global_data.h> | |
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c | |
index 97d6a31da1..cea6f72271 100644 | |
--- a/board/toradex/verdin-imx8mm/spl.c | |
+++ b/board/toradex/verdin-imx8mm/spl.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/arch/clock.h> | |
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c | |
index da995dd0f5..acf6826976 100644 | |
--- a/board/wandboard/wandboard.c | |
+++ b/board/wandboard/wandboard.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <init.h> | |
#include <log.h> | |
#include <asm/arch/clock.h> | |
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c | |
index 38c910fa5b..e101579454 100644 | |
--- a/board/xilinx/zynqmp/zynqmp.c | |
+++ b/board/xilinx/zynqmp/zynqmp.c | |
@@ -11,7 +11,7 @@ | |
#include <env.h> | |
#include <env_internal.h> | |
#include <init.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <net.h> | |
diff --git a/cmd/abootimg.c b/cmd/abootimg.c | |
index f48a9dcb02..58ccce2f74 100644 | |
--- a/cmd/abootimg.c | |
+++ b/cmd/abootimg.c | |
@@ -7,7 +7,7 @@ | |
#include <android_image.h> | |
#include <common.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mapmem.h> | |
#define abootimg_addr() \ | |
diff --git a/cmd/avb.c b/cmd/avb.c | |
index 783f51b816..696f96c8dc 100644 | |
--- a/cmd/avb.c | |
+++ b/cmd/avb.c | |
@@ -8,7 +8,7 @@ | |
#include <avb_verify.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <mmc.h> | |
diff --git a/cmd/bmp.c b/cmd/bmp.c | |
index 071ba90b43..933c366d47 100644 | |
--- a/cmd/bmp.c | |
+++ b/cmd/bmp.c | |
@@ -13,7 +13,7 @@ | |
#include <command.h> | |
#include <dm.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lcd.h> | |
#include <log.h> | |
#include <malloc.h> | |
diff --git a/cmd/bootefi.c b/cmd/bootefi.c | |
index 83eab0bd7f..aa9147be99 100644 | |
--- a/cmd/bootefi.c | |
+++ b/cmd/bootefi.c | |
@@ -16,7 +16,7 @@ | |
#include <efi_selftest.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <asm/global_data.h> | |
diff --git a/cmd/booti.c b/cmd/booti.c | |
index 397d4b8323..538a727732 100644 | |
--- a/cmd/booti.c | |
+++ b/cmd/booti.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <bootm.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <irq_func.h> | |
#include <lmb.h> | |
#include <log.h> | |
diff --git a/cmd/bootm.c b/cmd/bootm.c | |
index 92468d09a1..5fa678b163 100644 | |
--- a/cmd/bootm.c | |
+++ b/cmd/bootm.c | |
@@ -12,7 +12,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <nand.h> | |
#include <asm/byteorder.h> | |
diff --git a/cmd/bootz.c b/cmd/bootz.c | |
index 4f024bde5f..bd0f6c9303 100644 | |
--- a/cmd/bootz.c | |
+++ b/cmd/bootz.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <bootm.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <irq_func.h> | |
#include <lmb.h> | |
#include <log.h> | |
diff --git a/cmd/cramfs.c b/cmd/cramfs.c | |
index 44c0818d5d..13a6a924fd 100644 | |
--- a/cmd/cramfs.c | |
+++ b/cmd/cramfs.c | |
@@ -13,7 +13,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <mapmem.h> | |
#include <linux/list.h> | |
diff --git a/cmd/disk.c b/cmd/disk.c | |
index cb3b990ba3..0814534d08 100644 | |
--- a/cmd/disk.c | |
+++ b/cmd/disk.c | |
@@ -7,7 +7,7 @@ | |
#include <bootstage.h> | |
#include <command.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <part.h> | |
diff --git a/cmd/elf.c b/cmd/elf.c | |
index d75b21461c..26fd0e9b57 100644 | |
--- a/cmd/elf.c | |
+++ b/cmd/elf.c | |
@@ -9,7 +9,7 @@ | |
#include <cpu_func.h> | |
#include <elf.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <net.h> | |
#include <vxworks.h> | |
diff --git a/cmd/ext4.c b/cmd/ext4.c | |
index 4791b69fd9..c809caa79a 100644 | |
--- a/cmd/ext4.c | |
+++ b/cmd/ext4.c | |
@@ -29,7 +29,7 @@ | |
#include <part.h> | |
#include <config.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/ctype.h> | |
#include <asm/byteorder.h> | |
#include <ext4fs.h> | |
diff --git a/cmd/fdt.c b/cmd/fdt.c | |
index c42f1c79d4..d7a858c677 100644 | |
--- a/cmd/fdt.c | |
+++ b/cmd/fdt.c | |
@@ -10,7 +10,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/ctype.h> | |
#include <linux/types.h> | |
#include <asm/global_data.h> | |
diff --git a/cmd/fpga.c b/cmd/fpga.c | |
index 3fdd0b35e8..05b2f1a257 100644 | |
--- a/cmd/fpga.c | |
+++ b/cmd/fpga.c | |
@@ -13,7 +13,7 @@ | |
#include <fpga.h> | |
#include <fs.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
diff --git a/cmd/ide.c b/cmd/ide.c | |
index b78c38e159..d9fbf5b1da 100644 | |
--- a/cmd/ide.c | |
+++ b/cmd/ide.c | |
@@ -13,7 +13,7 @@ | |
#include <config.h> | |
#include <watchdog.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/byteorder.h> | |
#include <asm/io.h> | |
diff --git a/cmd/jffs2.c b/cmd/jffs2.c | |
index 63bd55263a..0d2daee397 100644 | |
--- a/cmd/jffs2.c | |
+++ b/cmd/jffs2.c | |
@@ -74,7 +74,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <flash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <jffs2/jffs2.h> | |
#include <linux/bug.h> | |
diff --git a/cmd/load.c b/cmd/load.c | |
index 381ed1b3e2..1dc908f336 100644 | |
--- a/cmd/load.c | |
+++ b/cmd/load.c | |
@@ -15,7 +15,7 @@ | |
#include <env.h> | |
#include <exports.h> | |
#include <flash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mapmem.h> | |
#include <net.h> | |
#include <s_record.h> | |
diff --git a/cmd/md5sum.c b/cmd/md5sum.c | |
index 0f0e1d3dd6..2747b43910 100644 | |
--- a/cmd/md5sum.c | |
+++ b/cmd/md5sum.c | |
@@ -10,7 +10,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mapmem.h> | |
#include <u-boot/md5.h> | |
#include <asm/io.h> | |
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c | |
index d4f381b6ad..5a62094af9 100644 | |
--- a/cmd/mvebu/bubt.c | |
+++ b/cmd/mvebu/bubt.c | |
@@ -9,7 +9,7 @@ | |
#include <command.h> | |
#include <env.h> | |
#include <flash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <net.h> | |
#include <vsprintf.h> | |
#include <errno.h> | |
diff --git a/cmd/nand.c b/cmd/nand.c | |
index d381053c6a..7c304f490a 100644 | |
--- a/cmd/nand.c | |
+++ b/cmd/nand.c | |
@@ -21,7 +21,7 @@ | |
#include <common.h> | |
#include <bootstage.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <asm/cache.h> | |
#include <linux/mtd/mtd.h> | |
#include <command.h> | |
diff --git a/cmd/net.c b/cmd/net.c | |
index 651c1411f4..8dffa649ef 100644 | |
--- a/cmd/net.c | |
+++ b/cmd/net.c | |
@@ -12,7 +12,7 @@ | |
#include <command.h> | |
#include <dm.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <net.h> | |
#include <net/udp.h> | |
#include <net/sntp.h> | |
diff --git a/cmd/optee_rpmb.c b/cmd/optee_rpmb.c | |
index e0e44bbed0..ca707ca9d0 100644 | |
--- a/cmd/optee_rpmb.c | |
+++ b/cmd/optee_rpmb.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <mmc.h> | |
#include <tee.h> | |
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c | |
index 067c24e5ff..159f57de5a 100644 | |
--- a/cmd/pxe_utils.c | |
+++ b/cmd/pxe_utils.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <mapmem.h> | |
diff --git a/cmd/reiser.c b/cmd/reiser.c | |
index 707167fcd5..d11aac755a 100644 | |
--- a/cmd/reiser.c | |
+++ b/cmd/reiser.c | |
@@ -12,7 +12,7 @@ | |
#include <config.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/ctype.h> | |
#include <asm/byteorder.h> | |
#include <reiserfs.h> | |
diff --git a/cmd/source.c b/cmd/source.c | |
index 81e015b64e..8ac5a2b2e1 100644 | |
--- a/cmd/source.c | |
+++ b/cmd/source.c | |
@@ -17,7 +17,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <mapmem.h> | |
diff --git a/cmd/spl.c b/cmd/spl.c | |
index 472703f8fe..77978a8f49 100644 | |
--- a/cmd/spl.c | |
+++ b/cmd/spl.c | |
@@ -8,7 +8,7 @@ | |
#include <command.h> | |
#include <cmd_spl.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
#include <linux/libfdt.h> | |
diff --git a/cmd/ximg.c b/cmd/ximg.c | |
index 65ba41320a..f8c85bbce2 100644 | |
--- a/cmd/ximg.c | |
+++ b/cmd/ximg.c | |
@@ -16,7 +16,7 @@ | |
#include <cpu_func.h> | |
#include <env.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <mapmem.h> | |
#include <watchdog.h> | |
diff --git a/cmd/zfs.c b/cmd/zfs.c | |
index 6ef1b56ab1..fa8e1c544a 100644 | |
--- a/cmd/zfs.c | |
+++ b/cmd/zfs.c | |
@@ -13,7 +13,7 @@ | |
#include <config.h> | |
#include <command.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/ctype.h> | |
#include <asm/byteorder.h> | |
#include <zfs_common.h> | |
diff --git a/common/avb_verify.c b/common/avb_verify.c | |
index 0520a71455..37b098d506 100644 | |
--- a/common/avb_verify.c | |
+++ b/common/avb_verify.c | |
@@ -7,7 +7,7 @@ | |
#include <avb_verify.h> | |
#include <blk.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <part.h> | |
#include <tee.h> | |
diff --git a/common/board_r.c b/common/board_r.c | |
index e3e6248a1f..c45ca1fef7 100644 | |
--- a/common/board_r.c | |
+++ b/common/board_r.c | |
@@ -16,7 +16,7 @@ | |
#include <exports.h> | |
#include <flash.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <irq_func.h> | |
#include <log.h> | |
#include <net.h> | |
diff --git a/common/boot_fit.c b/common/boot_fit.c | |
index dfc2a3117d..2cb47936c8 100644 | |
--- a/common/boot_fit.c | |
+++ b/common/boot_fit.c | |
@@ -9,7 +9,7 @@ | |
#include <boot_fit.h> | |
#include <common.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <linux/libfdt.h> | |
diff --git a/common/bootm.c b/common/bootm.c | |
index ea71522d0c..f269b45dd5 100644 | |
--- a/common/bootm.c | |
+++ b/common/bootm.c | |
@@ -31,7 +31,7 @@ | |
#include <command.h> | |
#include <bootm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#ifndef CONFIG_SYS_BOOTM_LEN | |
/* use 8MByte as default max gunzip size */ | |
diff --git a/common/bootm_os.c b/common/bootm_os.c | |
index d635037064..d567afa72b 100644 | |
--- a/common/bootm_os.c | |
+++ b/common/bootm_os.c | |
@@ -11,7 +11,7 @@ | |
#include <efi_loader.h> | |
#include <env.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
diff --git a/common/common_fit.c b/common/common_fit.c | |
index cde2dc45e9..72f96203e8 100644 | |
--- a/common/common_fit.c | |
+++ b/common/common_fit.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <linux/libfdt.h> | |
diff --git a/common/hash.c b/common/hash.c | |
index dca23635ab..4297489fb6 100644 | |
--- a/common/hash.c | |
+++ b/common/hash.c | |
@@ -28,7 +28,7 @@ | |
#endif /* !USE_HOSTCC*/ | |
#include <hash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/crc.h> | |
#include <u-boot/sha1.h> | |
#include <u-boot/sha256.h> | |
diff --git a/common/image-android.c b/common/image-android.c | |
index 1fbbbba1eb..4c4fb787e6 100644 | |
--- a/common/image-android.c | |
+++ b/common/image-android.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <image-android-dt.h> | |
#include <android_image.h> | |
#include <malloc.h> | |
diff --git a/common/image-cipher.c b/common/image-cipher.c | |
index b906148939..9513a04fdb 100644 | |
--- a/common/image-cipher.c | |
+++ b/common/image-cipher.c | |
@@ -12,7 +12,7 @@ | |
#include <asm/global_data.h> | |
DECLARE_GLOBAL_DATA_PTR; | |
#endif /* !USE_HOSdTCC*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <uboot_aes.h> | |
#include <u-boot/aes.h> | |
diff --git a/common/image-fdt.c b/common/image-fdt.c | |
index 9441e63a3d..2766e9cf4c 100644 | |
--- a/common/image-fdt.c | |
+++ b/common/image-fdt.c | |
@@ -13,7 +13,7 @@ | |
#include <fdtdec.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <malloc.h> | |
diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c | |
index b979cd2a4b..03f9aa947d 100644 | |
--- a/common/image-fit-sig.c | |
+++ b/common/image-fit-sig.c | |
@@ -14,7 +14,7 @@ | |
DECLARE_GLOBAL_DATA_PTR; | |
#endif /* !USE_HOSTCC*/ | |
#include <fdt_region.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/rsa.h> | |
#include <u-boot/hash-checksum.h> | |
diff --git a/common/image-fit.c b/common/image-fit.c | |
index aff4670be3..79fb9a80d3 100644 | |
--- a/common/image-fit.c | |
+++ b/common/image-fit.c | |
@@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; | |
#endif /* !USE_HOSTCC*/ | |
#include <bootm.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <bootstage.h> | |
#include <linux/kconfig.h> | |
#include <u-boot/crc.h> | |
diff --git a/common/image-sig.c b/common/image-sig.c | |
index fb0035524e..c45650123b 100644 | |
--- a/common/image-sig.c | |
+++ b/common/image-sig.c | |
@@ -8,7 +8,7 @@ | |
#include <malloc.h> | |
#include <asm/global_data.h> | |
DECLARE_GLOBAL_DATA_PTR; | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/ecdsa.h> | |
#include <u-boot/rsa.h> | |
#include <u-boot/hash-checksum.h> | |
diff --git a/common/image.c b/common/image.c | |
index 59c52a1f9a..f41a248e07 100644 | |
--- a/common/image.c | |
+++ b/common/image.c | |
@@ -25,7 +25,7 @@ | |
#include <rtc.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lz4.h> | |
#include <mapmem.h> | |
@@ -64,7 +64,7 @@ static const image_header_t *image_get_ramdisk(ulong rd_addr, uint8_t arch, | |
#include "mkimage.h" | |
#include <u-boot/md5.h> | |
#include <time.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#ifndef __maybe_unused | |
# define __maybe_unused /* unimplemented */ | |
diff --git a/common/lynxkdi.c b/common/lynxkdi.c | |
index 1c8e122c32..96b8f16cad 100644 | |
--- a/common/lynxkdi.c | |
+++ b/common/lynxkdi.c | |
@@ -15,7 +15,7 @@ | |
#include <common.h> | |
#include <asm/processor.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <net.h> | |
#include <lynxkdi.h> | |
diff --git a/common/spl/spl.c b/common/spl/spl.c | |
index d55d3c2848..f11537f7ed 100644 | |
--- a/common/spl/spl.c | |
+++ b/common/spl/spl.c | |
@@ -25,7 +25,7 @@ | |
#include <fat.h> | |
#include <u-boot/crc.h> | |
#include <version.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <mapmem.h> | |
#include <dm/root.h> | |
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c | |
index e1b68dd561..473fd82fd1 100644 | |
--- a/common/spl/spl_atf.c | |
+++ b/common/spl/spl_atf.c | |
@@ -13,7 +13,7 @@ | |
#include <atf_common.h> | |
#include <cpu_func.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <asm/cache.h> | |
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c | |
index d73f062762..a6af421faa 100644 | |
--- a/common/spl/spl_ext.c | |
+++ b/common/spl/spl_ext.c | |
@@ -7,7 +7,7 @@ | |
#include <asm/u-boot.h> | |
#include <ext4fs.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
int spl_load_image_ext(struct spl_image_info *spl_image, | |
struct blk_desc *block_dev, int partition, | |
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c | |
index c2eb097365..950fd4c72b 100644 | |
--- a/common/spl/spl_fat.c | |
+++ b/common/spl/spl_fat.c | |
@@ -15,7 +15,7 @@ | |
#include <asm/u-boot.h> | |
#include <fat.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/libfdt.h> | |
static int fat_registered; | |
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c | |
index f41abca0cc..ddd5be22ef 100644 | |
--- a/common/spl/spl_fit.c | |
+++ b/common/spl/spl_fit.c | |
@@ -8,7 +8,7 @@ | |
#include <errno.h> | |
#include <fpga.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <mapmem.h> | |
diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c | |
index 82d0326806..1003401f77 100644 | |
--- a/common/spl/spl_legacy.c | |
+++ b/common/spl/spl_legacy.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <spl.h> | |
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c | |
index 212a2b0992..e386de65bc 100644 | |
--- a/common/spl/spl_mmc.c | |
+++ b/common/spl/spl_mmc.c | |
@@ -15,7 +15,7 @@ | |
#include <asm/u-boot.h> | |
#include <errno.h> | |
#include <mmc.h> | |
-#include <image.h> | |
+#include <image2.h> | |
static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc, | |
ulong sector, struct image_header *header) | |
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c | |
index 59f4a84a36..7fd34dec6b 100644 | |
--- a/common/spl/spl_nand.c | |
+++ b/common/spl/spl_nand.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <config.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <asm/io.h> | |
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c | |
index d23b395ab9..86fa992d3a 100644 | |
--- a/common/spl/spl_net.c | |
+++ b/common/spl/spl_net.c | |
@@ -9,7 +9,7 @@ | |
#include <common.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <net.h> | |
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c | |
index 5270401db0..744ea56e68 100644 | |
--- a/common/spl/spl_nor.c | |
+++ b/common/spl/spl_nor.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c | |
index 93cbf47e82..651ad64ef2 100644 | |
--- a/common/spl/spl_onenand.c | |
+++ b/common/spl/spl_onenand.c | |
@@ -9,7 +9,7 @@ | |
*/ | |
#include <common.h> | |
#include <config.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <asm/io.h> | |
diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c | |
index 1c0abf8553..fca32e8251 100644 | |
--- a/common/spl/spl_opensbi.c | |
+++ b/common/spl/spl_opensbi.c | |
@@ -9,7 +9,7 @@ | |
#include <cpu_func.h> | |
#include <errno.h> | |
#include <hang.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <spl.h> | |
#include <asm/global_data.h> | |
#include <asm/smp.h> | |
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c | |
index df1d5b43d8..e2b074d359 100644 | |
--- a/common/spl/spl_ram.c | |
+++ b/common/spl/spl_ram.c | |
@@ -11,7 +11,7 @@ | |
*/ | |
#include <common.h> | |
#include <binman_sym.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <mapmem.h> | |
#include <spl.h> | |
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c | |
index 535a9219ef..46f441eae0 100644 | |
--- a/common/spl/spl_sata.c | |
+++ b/common/spl/spl_sata.c | |
@@ -15,7 +15,7 @@ | |
#include <scsi.h> | |
#include <errno.h> | |
#include <fat.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION | |
#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION 1 | |
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c | |
index 9884e7c185..0962c9b180 100644 | |
--- a/common/spl/spl_spi.c | |
+++ b/common/spl/spl_spi.c | |
@@ -9,7 +9,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spi.h> | |
#include <spi_flash.h> | |
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c | |
index de6a63bd2d..97a3e73ce3 100644 | |
--- a/common/spl/spl_ubi.c | |
+++ b/common/spl/spl_ubi.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <config.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <nand.h> | |
#include <onenand_uboot.h> | |
#include <ubispl.h> | |
diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c | |
index 8ce0a09ef3..8d7489d932 100644 | |
--- a/common/spl/spl_xip.c | |
+++ b/common/spl/spl_xip.c | |
@@ -5,7 +5,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c | |
index e979f780ad..0e5782c824 100644 | |
--- a/common/spl/spl_ymodem.c | |
+++ b/common/spl/spl_ymodem.c | |
@@ -10,7 +10,7 @@ | |
*/ | |
#include <common.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <spl.h> | |
#include <xyzModem.h> | |
diff --git a/common/splash_source.c b/common/splash_source.c | |
index d05670f5ee..8a4b5c34f2 100644 | |
--- a/common/splash_source.c | |
+++ b/common/splash_source.c | |
@@ -12,7 +12,7 @@ | |
#include <errno.h> | |
#include <fs.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <nand.h> | |
#include <sata.h> | |
diff --git a/common/update.c b/common/update.c | |
index f5c8684f1b..fad25308ac 100644 | |
--- a/common/update.c | |
+++ b/common/update.c | |
@@ -8,7 +8,7 @@ | |
#include <common.h> | |
#include <cpu_func.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#if !(defined(CONFIG_FIT) && defined(CONFIG_OF_LIBFDT)) | |
#error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature" | |
diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c | |
index 2f3837e559..01e3988d3f 100644 | |
--- a/drivers/fastboot/fb_mmc.c | |
+++ b/drivers/fastboot/fb_mmc.c | |
@@ -12,7 +12,7 @@ | |
#include <fb_mmc.h> | |
#include <flash.h> | |
#include <image-sparse.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <part.h> | |
#include <mmc.h> | |
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c | |
index b992e6f080..116fe5e536 100644 | |
--- a/drivers/fpga/socfpga_arria10.c | |
+++ b/drivers/fpga/socfpga_arria10.c | |
@@ -2,7 +2,7 @@ | |
/* | |
* Copyright (C) 2017-2019 Intel Corporation <www.intel.com> | |
*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <asm/global_data.h> | |
#include <asm/io.h> | |
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c | |
index d52c986d4b..9e0a121a52 100644 | |
--- a/drivers/net/fsl-mc/mc.c | |
+++ b/drivers/net/fsl-mc/mc.c | |
@@ -8,7 +8,7 @@ | |
#include <cpu_func.h> | |
#include <env.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <asm/global_data.h> | |
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c | |
index ad5bc3c862..d4cba53dda 100644 | |
--- a/drivers/net/pfe_eth/pfe_firmware.c | |
+++ b/drivers/net/pfe_eth/pfe_firmware.c | |
@@ -12,7 +12,7 @@ | |
#include <dm.h> | |
#include <dm/device-internal.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <linux/bitops.h> | |
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c | |
index e48aa2f90d..078204edf9 100644 | |
--- a/drivers/usb/gadget/f_sdp.c | |
+++ b/drivers/usb/gadget/f_sdp.c | |
@@ -31,7 +31,7 @@ | |
#include <g_dnl.h> | |
#include <sdp.h> | |
#include <spl.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <imximage.h> | |
#include <watchdog.h> | |
diff --git a/include/bootm.h b/include/bootm.h | |
index 7f88ec718b..4741536f4d 100644 | |
--- a/include/bootm.h | |
+++ b/include/bootm.h | |
@@ -7,7 +7,7 @@ | |
#ifndef _BOOTM_H | |
#define _BOOTM_H | |
-#include <image.h> | |
+#include <image2.h> | |
struct cmd_tbl; | |
diff --git a/include/compiler.h b/include/compiler.h | |
index 27b9843497..1f33f55118 100644 | |
--- a/include/compiler.h | |
+++ b/include/compiler.h | |
@@ -5,6 +5,8 @@ | |
#ifndef __COMPILER_H__ | |
#define __COMPILER_H__ | |
+#define umode_t umode2_t | |
+ | |
#include <stddef.h> | |
#include <stdbool.h> | |
@@ -26,6 +28,9 @@ | |
#include <stdio.h> | |
#include <string.h> | |
+#undef umode_t | |
+ | |
+ | |
#if !defined(__WIN32__) && !defined(__MINGW32__) | |
# include <sys/mman.h> | |
#endif | |
diff --git a/include/efi_loader.h b/include/efi_loader.h | |
index 32cb8d0f1e..8d45653e19 100644 | |
--- a/include/efi_loader.h | |
+++ b/include/efi_loader.h | |
@@ -13,7 +13,7 @@ | |
#include <log.h> | |
#include <part_efi.h> | |
#include <efi_api.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <pe.h> | |
#include <linux/list.h> | |
#include <linux/oid_registry.h> | |
diff --git a/include/image.h b/include/image2.h | |
similarity index 100% | |
rename from include/image.h | |
rename to include/image2.h | |
diff --git a/include/imx8image.h b/include/imx8image.h | |
index 00c614ab6c..847662efe8 100644 | |
--- a/include/imx8image.h | |
+++ b/include/imx8image.h | |
@@ -8,7 +8,7 @@ | |
#ifndef _IMX8IMAGE_H_ | |
#define _IMX8IMAGE_H_ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <inttypes.h> | |
#include "imagetool.h" | |
diff --git a/include/tee/optee.h b/include/tee/optee.h | |
index ebdfe5e98d..55bbe488a7 100644 | |
--- a/include/tee/optee.h | |
+++ b/include/tee/optee.h | |
@@ -10,7 +10,7 @@ | |
#define _OPTEE_H | |
#include <linux/errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#define OPTEE_MAGIC 0x4554504f | |
#define OPTEE_VERSION 1 | |
diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h | |
index acbc50b9e6..0590d8601a 100644 | |
--- a/include/u-boot/aes.h | |
+++ b/include/u-boot/aes.h | |
@@ -7,7 +7,7 @@ | |
#define _AES_H | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#if IMAGE_ENABLE_ENCRYPT | |
int image_aes_encrypt(struct image_cipher_info *info, | |
diff --git a/include/u-boot/ecdsa.h b/include/u-boot/ecdsa.h | |
index f6951c7346..0abd6b252a 100644 | |
--- a/include/u-boot/ecdsa.h | |
+++ b/include/u-boot/ecdsa.h | |
@@ -7,7 +7,7 @@ | |
#define _ECDSA_H | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <linux/kconfig.h> | |
/** | |
diff --git a/include/u-boot/hash-checksum.h b/include/u-boot/hash-checksum.h | |
index 54e6a73744..df99d6cb0b 100644 | |
--- a/include/u-boot/hash-checksum.h | |
+++ b/include/u-boot/hash-checksum.h | |
@@ -7,7 +7,7 @@ | |
#define _RSA_CHECKSUM_H | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/sha1.h> | |
#include <u-boot/sha256.h> | |
#include <u-boot/sha512.h> | |
diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h | |
index fc9557c781..364c205310 100644 | |
--- a/include/u-boot/rsa-mod-exp.h | |
+++ b/include/u-boot/rsa-mod-exp.h | |
@@ -7,7 +7,7 @@ | |
#define _RSA_MOD_EXP_H | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
struct udevice; | |
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h | |
index 89a9c4caa0..8bb426416f 100644 | |
--- a/include/u-boot/rsa.h | |
+++ b/include/u-boot/rsa.h | |
@@ -12,7 +12,7 @@ | |
#define _RSA_H | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
/** | |
* struct rsa_public_key - holder for a public key | |
diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c | |
index 345029fa78..6073da1498 100644 | |
--- a/lib/aes/aes-decrypt.c | |
+++ b/lib/aes/aes-decrypt.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <malloc.h> | |
#endif | |
-#include <image.h> | |
+#include <image2.h> | |
#include <uboot_aes.h> | |
int image_aes_decrypt(struct image_cipher_info *info, | |
diff --git a/lib/aes/aes-encrypt.c b/lib/aes/aes-encrypt.c | |
index a6d1720f30..85f2a82d60 100644 | |
--- a/lib/aes/aes-encrypt.c | |
+++ b/lib/aes/aes-encrypt.c | |
@@ -5,7 +5,7 @@ | |
#include "mkimage.h" | |
#include <stdio.h> | |
#include <string.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <time.h> | |
#include <openssl/bn.h> | |
#include <openssl/rsa.h> | |
diff --git a/lib/crypto/pkcs7_verify.c b/lib/crypto/pkcs7_verify.c | |
index 82c5c745d4..b968b6fc35 100644 | |
--- a/lib/crypto/pkcs7_verify.c | |
+++ b/lib/crypto/pkcs7_verify.c | |
@@ -10,7 +10,7 @@ | |
#define pr_fmt(fmt) "PKCS7: "fmt | |
#ifdef __UBOOT__ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <string.h> | |
#include <linux/bitops.h> | |
#include <linux/compat.h> | |
diff --git a/lib/crypto/public_key.c b/lib/crypto/public_key.c | |
index df6033cdb4..89635d39e3 100644 | |
--- a/lib/crypto/public_key.c | |
+++ b/lib/crypto/public_key.c | |
@@ -26,7 +26,7 @@ | |
#endif | |
#include <crypto/public_key.h> | |
#ifdef __UBOOT__ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/rsa.h> | |
#else | |
#include <crypto/akcipher.h> | |
diff --git a/lib/crypto/x509_public_key.c b/lib/crypto/x509_public_key.c | |
index d557ab27ae..6a165fc183 100644 | |
--- a/lib/crypto/x509_public_key.c | |
+++ b/lib/crypto/x509_public_key.c | |
@@ -8,7 +8,7 @@ | |
#define pr_fmt(fmt) "X.509: "fmt | |
#ifdef __UBOOT__ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <dm/devres.h> | |
#include <linux/compat.h> | |
#include <linux/err.h> | |
diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c | |
index a1b88dbfc2..dd06ef6cc1 100644 | |
--- a/lib/efi_loader/efi_firmware.c | |
+++ b/lib/efi_loader/efi_firmware.c | |
@@ -10,7 +10,7 @@ | |
#include <charset.h> | |
#include <dfu.h> | |
#include <efi_loader.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <signatures.h> | |
#include <linux/list.h> | |
diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c | |
index bdd09881fc..ad9fdd93b9 100644 | |
--- a/lib/efi_loader/efi_signature.c | |
+++ b/lib/efi_loader/efi_signature.c | |
@@ -7,7 +7,7 @@ | |
#include <common.h> | |
#include <charset.h> | |
#include <efi_loader.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <hexdump.h> | |
#include <malloc.h> | |
#include <crypto/pkcs7.h> | |
diff --git a/lib/gunzip.c b/lib/gunzip.c | |
index bee3b9261f..077a557775 100644 | |
--- a/lib/gunzip.c | |
+++ b/lib/gunzip.c | |
@@ -10,7 +10,7 @@ | |
#include <console.h> | |
#include <div64.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <memalign.h> | |
#include <u-boot/crc.h> | |
diff --git a/lib/gzip.c b/lib/gzip.c | |
index c6c0ec880c..23ef98df36 100644 | |
--- a/lib/gzip.c | |
+++ b/lib/gzip.c | |
@@ -8,7 +8,7 @@ | |
#include <watchdog.h> | |
#include <command.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <memalign.h> | |
#include <u-boot/zlib.h> | |
diff --git a/lib/hash-checksum.c b/lib/hash-checksum.c | |
index d732ecc38f..de20c1d3c2 100644 | |
--- a/lib/hash-checksum.c | |
+++ b/lib/hash-checksum.c | |
@@ -14,7 +14,7 @@ | |
#include "fdt_host.h" | |
#endif | |
#include <hash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
int hash_calculate(const char *name, | |
const struct image_region region[], | |
diff --git a/lib/lmb.c b/lib/lmb.c | |
index 7bd1255f7a..37eadb19e4 100644 | |
--- a/lib/lmb.c | |
+++ b/lib/lmb.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <malloc.h> | |
diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c | |
index cdbcd05bd4..ace67671e8 100644 | |
--- a/lib/lz4_wrapper.c | |
+++ b/lib/lz4_wrapper.c | |
@@ -5,7 +5,7 @@ | |
#include <common.h> | |
#include <compiler.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lz4.h> | |
#include <linux/kernel.h> | |
#include <linux/types.h> | |
diff --git a/lib/optee/optee.c b/lib/optee/optee.c | |
index 672690dc53..ee045badef 100644 | |
--- a/lib/optee/optee.c | |
+++ b/lib/optee/optee.c | |
@@ -6,7 +6,7 @@ | |
#include <common.h> | |
#include <fdtdec.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
#include <dm/ofnode.h> | |
diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c | |
index 98855f67b8..36588fff27 100644 | |
--- a/lib/rsa/rsa-keyprop.c | |
+++ b/lib/rsa/rsa-keyprop.c | |
@@ -10,7 +10,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <malloc.h> | |
#include <crypto/internal/rsa.h> | |
#include <u-boot/rsa-mod-exp.h> | |
diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c | |
index 085dc89bf7..ec77d8ebf3 100644 | |
--- a/lib/rsa/rsa-sign.c | |
+++ b/lib/rsa/rsa-sign.c | |
@@ -7,7 +7,7 @@ | |
#include <stdlib.h> | |
#include <stdio.h> | |
#include <string.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <time.h> | |
#include <u-boot/fdt-libcrypto.h> | |
#include <openssl/bn.h> | |
diff --git a/net/net.c b/net/net.c | |
index c2992a0908..ebeac102d9 100644 | |
--- a/net/net.c | |
+++ b/net/net.c | |
@@ -88,7 +88,7 @@ | |
#include <env.h> | |
#include <env_internal.h> | |
#include <errno.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <net.h> | |
#include <net/fastboot.h> | |
diff --git a/net/nfs.c b/net/nfs.c | |
index 70d0e08bde..479934cf3a 100644 | |
--- a/net/nfs.c | |
+++ b/net/nfs.c | |
@@ -29,7 +29,7 @@ | |
#include <common.h> | |
#include <command.h> | |
#include <flash.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <net.h> | |
#include <malloc.h> | |
diff --git a/net/tftp.c b/net/tftp.c | |
index 5baf528f4e..4825752760 100644 | |
--- a/net/tftp.c | |
+++ b/net/tftp.c | |
@@ -9,7 +9,7 @@ | |
#include <command.h> | |
#include <efi_loader.h> | |
#include <env.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <lmb.h> | |
#include <log.h> | |
#include <mapmem.h> | |
diff --git a/test/compression.c b/test/compression.c | |
index 4cd1be564f..b19685f81f 100644 | |
--- a/test/compression.c | |
+++ b/test/compression.c | |
@@ -7,7 +7,7 @@ | |
#include <bootm.h> | |
#include <command.h> | |
#include <gzip.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <lz4.h> | |
#include <malloc.h> | |
diff --git a/test/image/spl_load.c b/test/image/spl_load.c | |
index e7cabf5680..c7ef8049b6 100644 | |
--- a/test/image/spl_load.c | |
+++ b/test/image/spl_load.c | |
@@ -5,7 +5,7 @@ | |
*/ | |
#include <common.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <mapmem.h> | |
#include <os.h> | |
#include <spl.h> | |
diff --git a/test/lib/rsa.c b/test/lib/rsa.c | |
index 44f8ade226..94262de3a4 100644 | |
--- a/test/lib/rsa.c | |
+++ b/test/lib/rsa.c | |
@@ -8,7 +8,7 @@ | |
#include <common.h> | |
#include <command.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <test/lib.h> | |
#include <test/test.h> | |
#include <test/ut.h> | |
diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c | |
index 56a3df1713..9a43624ac0 100644 | |
--- a/test/overlay/cmd_ut_overlay.c | |
+++ b/test/overlay/cmd_ut_overlay.c | |
@@ -8,7 +8,7 @@ | |
#include <command.h> | |
#include <errno.h> | |
#include <fdt_support.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <log.h> | |
#include <malloc.h> | |
diff --git a/tools/aisimage.c b/tools/aisimage.c | |
index b8b3ee3207..4c1ddf3532 100644 | |
--- a/tools/aisimage.c | |
+++ b/tools/aisimage.c | |
@@ -6,7 +6,7 @@ | |
#include "imagetool.h" | |
#include "aisimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#define IS_FNC_EXEC(c) (cmd_table[c].AIS_cmd == AIS_CMD_FNLOAD) | |
#define WORD_ALIGN0 4 | |
diff --git a/tools/atmelimage.c b/tools/atmelimage.c | |
index 7b3b243d58..b8ba6d4330 100644 | |
--- a/tools/atmelimage.c | |
+++ b/tools/atmelimage.c | |
@@ -7,7 +7,7 @@ | |
#include "imagetool.h" | |
#include "mkimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#define pr_err(fmt, args...) fprintf(stderr, "atmelimage Error: " fmt, ##args) | |
diff --git a/tools/default_image.c b/tools/default_image.c | |
index e164c0c27d..6176085975 100644 | |
--- a/tools/default_image.c | |
+++ b/tools/default_image.c | |
@@ -17,7 +17,7 @@ | |
#include "mkimage.h" | |
#include <u-boot/crc.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <tee/optee.h> | |
#include <u-boot/crc.h> | |
#include <imximage.h> | |
diff --git a/tools/dumpimage.c b/tools/dumpimage.c | |
index e5481435a7..eb8d6856fa 100644 | |
--- a/tools/dumpimage.c | |
+++ b/tools/dumpimage.c | |
@@ -6,7 +6,7 @@ | |
*/ | |
#include "dumpimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <version.h> | |
static void usage(void); | |
diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c | |
index 5573842d25..6ead151e03 100644 | |
--- a/tools/fit_check_sign.c | |
+++ b/tools/fit_check_sign.c | |
@@ -20,7 +20,7 @@ | |
#include "mkimage.h" | |
#include "fit_common.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/crc.h> | |
void usage(char *cmdname) | |
diff --git a/tools/fit_common.c b/tools/fit_common.c | |
index 52b63296f8..a39540c5c8 100644 | |
--- a/tools/fit_common.c | |
+++ b/tools/fit_common.c | |
@@ -20,7 +20,7 @@ | |
#include "imagetool.h" | |
#include "mkimage.h" | |
#include "fit_common.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/crc.h> | |
int fit_verify_header(unsigned char *ptr, int image_size, | |
diff --git a/tools/fit_common.h b/tools/fit_common.h | |
index 1e81d4c68b..b32897ca3e 100644 | |
--- a/tools/fit_common.h | |
+++ b/tools/fit_common.h | |
@@ -8,7 +8,7 @@ | |
#include "imagetool.h" | |
#include "mkimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
/** | |
* Verify the format of FIT header pointed to by ptr | |
diff --git a/tools/fit_image.c b/tools/fit_image.c | |
index f4f372ba62..7f93622ed9 100644 | |
--- a/tools/fit_image.c | |
+++ b/tools/fit_image.c | |
@@ -16,7 +16,7 @@ | |
#include "imagetool.h" | |
#include "fit_common.h" | |
#include "mkimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <string.h> | |
#include <stdarg.h> | |
#include <version.h> | |
diff --git a/tools/fit_info.c b/tools/fit_info.c | |
index b2642ec5b7..41ff73a1fc 100644 | |
--- a/tools/fit_info.c | |
+++ b/tools/fit_info.c | |
@@ -23,7 +23,7 @@ | |
#include "mkimage.h" | |
#include "fit_common.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/crc.h> | |
void usage(char *cmdname) | |
diff --git a/tools/gpimage-common.c b/tools/gpimage-common.c | |
index fc6406b913..fa1839e4fe 100644 | |
--- a/tools/gpimage-common.c | |
+++ b/tools/gpimage-common.c | |
@@ -19,7 +19,7 @@ | |
#include "imagetool.h" | |
#include <compiler.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include "gpheader.h" | |
/* Helper to convert size and load_addr to big endian */ | |
diff --git a/tools/gpimage.c b/tools/gpimage.c | |
index 27de4cfaed..50bf4c5b95 100644 | |
--- a/tools/gpimage.c | |
+++ b/tools/gpimage.c | |
@@ -20,7 +20,7 @@ | |
#include "imagetool.h" | |
#include <compiler.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include "gpheader.h" | |
static uint8_t gpimage_header[GPIMAGE_HDR_SIZE]; | |
diff --git a/tools/image-host.c b/tools/image-host.c | |
index d3a882ec29..aee30c08af 100644 | |
--- a/tools/image-host.c | |
+++ b/tools/image-host.c | |
@@ -11,7 +11,7 @@ | |
#include "mkimage.h" | |
#include <bootm.h> | |
#include <fdt_region.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <version.h> | |
/** | |
diff --git a/tools/image-sig-host.c b/tools/image-sig-host.c | |
index 8ed6998dab..4935f2e6fe 100644 | |
--- a/tools/image-sig-host.c | |
+++ b/tools/image-sig-host.c | |
@@ -7,7 +7,7 @@ | |
#include <fdt_support.h> | |
#include <time.h> | |
#include <linux/libfdt.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/ecdsa.h> | |
#include <u-boot/rsa.h> | |
#include <u-boot/hash-checksum.h> | |
diff --git a/tools/imagetool.c b/tools/imagetool.c | |
index ba1f64aa37..ccb6f6997b 100644 | |
--- a/tools/imagetool.c | |
+++ b/tools/imagetool.c | |
@@ -7,7 +7,7 @@ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
struct image_type_params *imagetool_get_type(int type) | |
{ | |
diff --git a/tools/imx8image.c b/tools/imx8image.c | |
index fa8f227487..183b52db9b 100644 | |
--- a/tools/imx8image.c | |
+++ b/tools/imx8image.c | |
@@ -6,7 +6,7 @@ | |
*/ | |
#include "imx8image.h" | |
-#include <image.h> | |
+#include <image2.h> | |
static int p_idx; | |
static int sector_size; | |
diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c | |
index 11e40ccd94..cbb048ad99 100644 | |
--- a/tools/imx8mimage.c | |
+++ b/tools/imx8mimage.c | |
@@ -7,7 +7,7 @@ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include "imximage.h" | |
#include "compiler.h" | |
diff --git a/tools/imximage.c b/tools/imximage.c | |
index 5c23fba3b1..c5731c3bf2 100644 | |
--- a/tools/imximage.c | |
+++ b/tools/imximage.c | |
@@ -9,7 +9,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include "imximage.h" | |
#include <generated/autoconf.h> | |
diff --git a/tools/kwbimage.c b/tools/kwbimage.c | |
index 00cb338d64..a88eb9c0f9 100644 | |
--- a/tools/kwbimage.c | |
+++ b/tools/kwbimage.c | |
@@ -11,7 +11,7 @@ | |
#include "imagetool.h" | |
#include <limits.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <stdarg.h> | |
#include <stdint.h> | |
#include "kwbimage.h" | |
diff --git a/tools/kwboot.c b/tools/kwboot.c | |
index 7feeaa45a2..f4cc27af97 100644 | |
--- a/tools/kwboot.c | |
+++ b/tools/kwboot.c | |
@@ -16,7 +16,7 @@ | |
#include <stdio.h> | |
#include <string.h> | |
#include <stdarg.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include <libgen.h> | |
#include <fcntl.h> | |
#include <errno.h> | |
diff --git a/tools/lpc32xximage.c b/tools/lpc32xximage.c | |
index 37931f9184..17efa85b03 100644 | |
--- a/tools/lpc32xximage.c | |
+++ b/tools/lpc32xximage.c | |
@@ -22,7 +22,7 @@ | |
#include "imagetool.h" | |
#include <compiler.h> | |
-#include <image.h> | |
+#include <image2.h> | |
/* | |
* NAND page 0 boot header | |
diff --git a/tools/mkimage.c b/tools/mkimage.c | |
index 302bfcf971..d70b8825d9 100644 | |
--- a/tools/mkimage.c | |
+++ b/tools/mkimage.c | |
@@ -10,7 +10,7 @@ | |
#include "imagetool.h" | |
#include "mkimage.h" | |
#include "imximage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <version.h> | |
#ifdef __linux__ | |
#include <sys/ioctl.h> | |
diff --git a/tools/mtk_image.c b/tools/mtk_image.c | |
index 418c5fd54b..580608eb63 100644 | |
--- a/tools/mtk_image.c | |
+++ b/tools/mtk_image.c | |
@@ -6,7 +6,7 @@ | |
* Author: Weijie Gao <weijie.gao@mediatek.com> | |
*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include <u-boot/sha256.h> | |
#include "imagetool.h" | |
#include "mtk_image.h" | |
diff --git a/tools/mxsimage.c b/tools/mxsimage.c | |
index 002f4b525a..e453c594b6 100644 | |
--- a/tools/mxsimage.c | |
+++ b/tools/mxsimage.c | |
@@ -20,7 +20,7 @@ | |
#include "imagetool.h" | |
#include "mxsimage.h" | |
#include "pbl_crc32.h" | |
-#include <image.h> | |
+#include <image2.h> | |
/* | |
* OpenSSL 1.1.0 and newer compatibility functions: | |
diff --git a/tools/omapimage.c b/tools/omapimage.c | |
index c59cdcc79b..fdf6f3e600 100644 | |
--- a/tools/omapimage.c | |
+++ b/tools/omapimage.c | |
@@ -15,7 +15,7 @@ | |
#include "imagetool.h" | |
#include <compiler.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#include "gpheader.h" | |
#include "omapimage.h" | |
diff --git a/tools/pblimage.c b/tools/pblimage.c | |
index 3c823e96cf..fb9fd86d62 100644 | |
--- a/tools/pblimage.c | |
+++ b/tools/pblimage.c | |
@@ -3,7 +3,7 @@ | |
* Copyright 2012-2014 Freescale Semiconductor, Inc. | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include "pblimage.h" | |
#include "pbl_crc32.h" | |
#include <u-boot/crc.h> | |
diff --git a/tools/rkcommon.c b/tools/rkcommon.c | |
index d55cd2c2d5..845fbb088b 100644 | |
--- a/tools/rkcommon.c | |
+++ b/tools/rkcommon.c | |
@@ -9,7 +9,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <rc4.h> | |
#include "mkimage.h" | |
#include "rkcommon.h" | |
diff --git a/tools/rkimage.c b/tools/rkimage.c | |
index 1c5540b1c3..f5e0a5f17c 100644 | |
--- a/tools/rkimage.c | |
+++ b/tools/rkimage.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include "rkcommon.h" | |
static uint32_t header; | |
diff --git a/tools/rksd.c b/tools/rksd.c | |
index 7d46a1b07b..07b4c0ef86 100644 | |
--- a/tools/rksd.c | |
+++ b/tools/rksd.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <rc4.h> | |
#include "mkimage.h" | |
#include "rkcommon.h" | |
diff --git a/tools/rkspi.c b/tools/rkspi.c | |
index f2530f7bde..88a276d464 100644 | |
--- a/tools/rkspi.c | |
+++ b/tools/rkspi.c | |
@@ -7,7 +7,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <rc4.h> | |
#include "mkimage.h" | |
#include "rkcommon.h" | |
diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c | |
index eba812fec9..c355edb36f 100644 | |
--- a/tools/socfpgaimage.c | |
+++ b/tools/socfpgaimage.c | |
@@ -57,7 +57,7 @@ | |
#include "mkimage.h" | |
#include <u-boot/crc.h> | |
-#include <image.h> | |
+#include <image2.h> | |
#define HEADER_OFFSET 0x40 | |
#define VALIDATION_WORD 0x31305341 | |
diff --git a/tools/stm32image.c b/tools/stm32image.c | |
index 18357c0518..08ae1ab60f 100644 | |
--- a/tools/stm32image.c | |
+++ b/tools/stm32image.c | |
@@ -3,7 +3,7 @@ | |
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved | |
*/ | |
-#include <image.h> | |
+#include <image2.h> | |
#include "imagetool.h" | |
/* magic ='S' 'T' 'M' 0x32 */ | |
diff --git a/tools/sunxi_egon.c b/tools/sunxi_egon.c | |
index a5299eb6a1..7f03c81a6c 100644 | |
--- a/tools/sunxi_egon.c | |
+++ b/tools/sunxi_egon.c | |
@@ -4,7 +4,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include <sunxi_image.h> | |
diff --git a/tools/ublimage.c b/tools/ublimage.c | |
index 1d2e897f6b..c82c27476c 100644 | |
--- a/tools/ublimage.c | |
+++ b/tools/ublimage.c | |
@@ -13,7 +13,7 @@ | |
*/ | |
#include "imagetool.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#include "ublimage.h" | |
/* | |
diff --git a/tools/vybridimage.c b/tools/vybridimage.c | |
index 94a6684c19..2aff0f27ac 100644 | |
--- a/tools/vybridimage.c | |
+++ b/tools/vybridimage.c | |
@@ -10,7 +10,7 @@ | |
#include "imagetool.h" | |
#include <compiler.h> | |
-#include <image.h> | |
+#include <image2.h> | |
/* | |
* NAND page 0 boot header | |
diff --git a/tools/zynqimage.c b/tools/zynqimage.c | |
index d3f418b061..880d97bde7 100644 | |
--- a/tools/zynqimage.c | |
+++ b/tools/zynqimage.c | |
@@ -46,7 +46,7 @@ | |
#include "imagetool.h" | |
#include "mkimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
#define HEADER_INTERRUPT_DEFAULT (cpu_to_le32(0xeafffffe)) | |
#define HEADER_REGINIT_NULL (cpu_to_le32(0xffffffff)) | |
diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c | |
index 82ce0ac1a5..63764625d1 100644 | |
--- a/tools/zynqmpbif.c | |
+++ b/tools/zynqmpbif.c | |
@@ -8,7 +8,7 @@ | |
#include "mkimage.h" | |
#include "zynqmpimage.h" | |
#include <elf.h> | |
-#include <image.h> | |
+#include <image2.h> | |
struct bif_entry { | |
const char *filename; | |
diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c | |
index 19b2f02ff1..c948cdc7e5 100644 | |
--- a/tools/zynqmpimage.c | |
+++ b/tools/zynqmpimage.c | |
@@ -58,7 +58,7 @@ | |
#include "imagetool.h" | |
#include "mkimage.h" | |
#include "zynqmpimage.h" | |
-#include <image.h> | |
+#include <image2.h> | |
static struct zynqmp_header zynqmpimage_header; | |
static void *dynamic_header; | |
-- | |
2.30.2 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment