common: Move the image globals into image.h

These three globals relate to image handling. Move them to the image
header file.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/bmp.c b/cmd/bmp.c
index 1e4c9720fea0a19f4edeab9e17db6dd788a5414b..edf4f564266bf9eddbe068c6765ad12ede49fb22 100644 (file)
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -13,6 +13,7 @@
 #include <command.h>
 #include <dm.h>
 #include <gzip.h>
+#include <image.h>
 #include <lcd.h>
 #include <malloc.h>
 #include <mapmem.h>

diff --git a/cmd/bootz.c b/cmd/bootz.c
index 7bfc491221a5af4c7ccaec217c009fef462f03d4..f14a5fefbfc68725160d8f468debdbe9ff67328c 100644 (file)
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
+#include <image.h>
 #include <irq_func.h>
 #include <lmb.h>
 #include <linux/compiler.h>

diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 1bc987528f084321f98d7ef02dde7f761a9ae905..ad232deae009c2b323b85f5a185a393da5316adf 100644 (file)
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <linux/list.h>

diff --git a/cmd/disk.c b/cmd/disk.c
index c57561b3cb79b93d37038e1a2c3c0a9d58a52a69..15973b7d132e19ee1e07621001057b8547156564 100644 (file)
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <image.h>
 #include <part.h>
 
 int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,

diff --git a/cmd/elf.c b/cmd/elf.c
index 57736f997bf856f0a49d62c9f8383ec8b86f8bba..ba06df06cf338e1a8c3c0a8eabe209df25898e5f 100644 (file)
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -18,6 +18,7 @@
 #include <cpu_func.h>
 #include <elf.h>
 #include <env.h>
+#include <image.h>
 #include <net.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86

diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 672ed43b3f3cadf42cbe632935dd7d3a4156172b..da2580d85d729dd9cfb579e05bf84e1dc2c938d5 100644 (file)
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -73,6 +73,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <jffs2/jffs2.h>
 #include <linux/list.h>

diff --git a/cmd/load.c b/cmd/load.c
index bed973ede9127942a306fe0dc2657cbf181e6927..fab30fe894318a9308bc7cb41e948b9b6d229879 100644 (file)
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -13,6 +13,7 @@
 #include <cpu_func.h>
 #include <env.h>
 #include <flash.h>
+#include <image.h>
 #include <s_record.h>
 #include <net.h>
 #include <exports.h>

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 6c68620d147f02bb59789259c8bac5902526d393..2041a7a29aa91b184bc1bcbe263c5f04edf54430 100644 (file)
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <image.h>
 #include <vsprintf.h>
 #include <errno.h>
 #include <dm.h>

diff --git a/cmd/nand.c b/cmd/nand.c
index 92089a73c172def64dddbef677b1b05727d666fc..4de6892a01b845262aefe40cfea0da550b7e8f5c 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <image.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>

diff --git a/cmd/net.c b/cmd/net.c
index 6bce214e45a7b2c8e700e5d3baa74214abba393c..1b724cc57090e7ab81eecf750c48157d1fa57ce8 100644 (file)
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <image.h>
 #include <net.h>
 
 static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);

diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
index ff8b0dcd7b82c727c829a3c09c0524dde8966f25..8b830212ce163d8e55c203fac5684aedb258543a 100644 (file)
--- a/cmd/pxe_utils.c
+++ b/cmd/pxe_utils.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <lcd.h>

diff --git a/common/board_r.c b/common/board_r.c
index cf3a5f7b7398d10373b69227aec791edc47d179b..668496abedc68639c102ca8ed7530c9737cd0414 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -13,6 +13,7 @@
 #include <api.h>
 #include <cpu_func.h>
 #include <exports.h>
+#include <image.h>
 #include <irq_func.h>
 #include <net.h>
 #include <u-boot/crc.h>

diff --git a/common/update.c b/common/update.c
index bfb760e52a2dc99d721c40b259103fdbbf794800..c8dd346a0956951a0683679bdd37d13c07383e60 100644 (file)
--- a/common/update.c
+++ b/common/update.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <cpu_func.h>
+#include <image.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/ddr/marvell/a38x/ddr3_training_ip_engine.c b/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c
index 27610d48cff9ad7ba9f157c2fa13bda69fc256d1..9293d54e5a0d012ce0a4f587e6e88b494d380fb9 100644 (file)
--- a/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c
+++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c
@@ -6,6 +6,7 @@
 #include "ddr3_init.h"
 #include "mv_ddr_regs.h"
 #include "ddr_training_ip_db.h"
+#include <image.h>
 
 #define PATTERN_1      0x55555555
 #define PATTERN_2      0xaaaaaaaa

diff --git a/include/common.h b/include/common.h
index 09b5f62ae3141553d7c5c28f7f0a9a44e41895d4..5e38c5fc5821cdd953d5953fc63d815285a872a6 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -62,10 +62,6 @@ void hang            (void) __attribute__ ((noreturn));
 /* common/cmd_source.c */
 int    source (ulong addr, const char *fit_uname);
 
-extern ulong image_load_addr;          /* Default Load Address */
-extern ulong image_save_addr;          /* Default Save Address */
-extern ulong image_save_size;          /* Default Save Size */
-
 /* common/memsize.c */
 long   get_ram_size  (long *, long);
 phys_size_t get_effective_memsize(void);

diff --git a/include/image.h b/include/image.h
index 86ebaae4fe34010b51dadb51014b857ce4fa20b8..3649644cf1d35ca541cbfaee02acdbc87413f38f 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -112,6 +112,10 @@ struct fdt_region;
 # define IMAGE_OF_SYSTEM_SETUP 0
 #endif
 
+extern ulong image_load_addr;          /* Default Load Address */
+extern ulong image_save_addr;          /* Default Save Address */
+extern ulong image_save_size;          /* Default Save Size */
+
 enum ih_category {
        IH_ARCH,
        IH_COMP,

diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index c883c498e1d4ce80f0d59d219caf9af503ee93a9..9b49eb8ee760ae7bb3424f5d2e6e57d6b92364fc 100644 (file)
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <image.h>
 #include <malloc.h>
 #include <linux/libfdt.h>
 #include <tee/optee.h>

diff --git a/net/net.c b/net/net.c
index b9bf0d1a8b521cb2623a9b8857a6a66aa5778886..d8a60b6119101526c71ab4c1ce72905fd82ea3df 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -93,6 +93,7 @@
 #include <env.h>
 #include <env_internal.h>
 #include <errno.h>
+#include <image.h>
 #include <net.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>

diff --git a/net/nfs.c b/net/nfs.c
index 5226e2c163eeb5b65fd47257deb9fbfc8c9ddce6..72e1018a3bdd54a01038e5ef2ef6e56fff9461ae 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -29,6 +29,7 @@
 #include <common.h>
 #include <command.h>
 #include <flash.h>
+#include <image.h>
 #include <net.h>
 #include <malloc.h>
 #include <mapmem.h>

diff --git a/net/tftp.c b/net/tftp.c
index 899d3b89d3e028339d18d145af4c09c8c1fffc24..02401898c5566c089c8d35158c848c7e8e3275e3 100644 (file)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -10,6 +10,7 @@
 #include <command.h>
 #include <efi_loader.h>
 #include <env.h>
+#include <image.h>
 #include <mapmem.h>
 #include <net.h>
 #include <net/tftp.h>