Selaa lähdekoodia

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>
Simon Glass 4 vuotta sitten
vanhempi
commit
8e8ccfe1aa
20 muutettua tiedostoa jossa 22 lisäystä ja 4 poistoa
  1. 1 0
      cmd/bmp.c
  2. 1 0
      cmd/bootz.c
  3. 1 0
      cmd/cramfs.c
  4. 1 0
      cmd/disk.c
  5. 1 0
      cmd/elf.c
  6. 1 0
      cmd/jffs2.c
  7. 1 0
      cmd/load.c
  8. 1 0
      cmd/mvebu/bubt.c
  9. 1 0
      cmd/nand.c
  10. 1 0
      cmd/net.c
  11. 1 0
      cmd/pxe_utils.c
  12. 1 0
      common/board_r.c
  13. 1 0
      common/update.c
  14. 1 0
      drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c
  15. 0 4
      include/common.h
  16. 4 0
      include/image.h
  17. 1 0
      lib/optee/optee.c
  18. 1 0
      net/net.c
  19. 1 0
      net/nfs.c
  20. 1 0
      net/tftp.c

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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,

+ 1 - 0
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

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
cmd/nand.c

@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <image.h>
 #include <linux/mtd/mtd.h>
 #include <command.h>
 #include <console.h>

+ 1 - 0
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 []);

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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"

+ 1 - 0
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

+ 0 - 4
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);

+ 4 - 0
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,

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>

+ 1 - 0
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>