image: Rename load_addr, save_addr, save_size

[oweals/u-boot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index f38dc2ef3fbc4d779f86bd5616bdc3d730b87f5e..09b5f62ae3141553d7c5c28f7f0a9a44e41895d4 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -62,9 +62,9 @@ void  hang            (void) __attribute__ ((noreturn));
 /* common/cmd_source.c */
 int    source (ulong addr, const char *fit_uname);
 
-extern ulong load_addr;                /* Default Load Address */
-extern ulong save_addr;                /* Default Save Address */
-extern ulong save_size;                /* Default Save Size */
+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);
@@ -74,16 +74,6 @@ phys_size_t get_effective_memsize(void);
 int testdram(void);
 #endif /* CONFIG_SYS_DRAM_TEST */
 
-void   upmconfig     (unsigned int, unsigned int *, unsigned int);
-ulong  get_tbclk     (void);
-void   reset_misc    (void);
-void   reset_cpu     (ulong addr);
-
-/* $(CPU)/speed.c */
-int    get_clocks (void);
-ulong  get_bus_freq  (ulong);
-int get_serial_clock(void);
-
 /* lib/uuid.c */
 #include <uuid.h>
 
@@ -114,13 +104,6 @@ int get_serial_clock(void);
        offsetof(struct structure, member) == offset, \
        "`struct " #structure "` offset for `" #member "` is not " #offset)
 
-/* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */
-#ifdef CONFIG_EFI_STUB
-#define ll_boot_init() false
-#else
-#define ll_boot_init() true
-#endif
-
 /* Pull in stuff for the build system */
 #ifdef DO_DEPS_ONLY
 # include <env_internal.h>