Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / arch / arm / include / asm / u-boot-arm.h

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index faf800a17be98b7eccadc8a16f88afc4c4999aa2..3904027016e69bb31e6579b72f6133d74b8d89ee 100644 (file)
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -30,20 +30,17 @@
 #define _U_BOOT_ARM_H_ 1
 
 /* for the following variables, see start.S */
-extern ulong _bss_start;       /* code + data end == BSS start */
-extern ulong _bss_end;         /* BSS end */
+extern ulong _bss_start_ofs;   /* BSS start relative to _start */
+extern ulong _bss_end_ofs;             /* BSS end relative to _start */
+extern ulong _end_ofs;         /* end of image relative to _start */
 extern ulong IRQ_STACK_START;  /* top of IRQ stack */
 extern ulong FIQ_STACK_START;  /* top of FIQ stack */
-#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
-extern ulong _armboot_start;   /* code start */
-#else
 extern ulong _TEXT_BASE;       /* code start */
-extern ulong _datarel_start;
-extern ulong _datarelrolocal_start;
-extern ulong _datarellocal_start;
-extern ulong _datarelro_start;
+extern ulong _datarel_start_ofs;
+extern ulong _datarelrolocal_start_ofs;
+extern ulong _datarellocal_start_ofs;
+extern ulong _datarelro_start_ofs;
 extern ulong IRQ_STACK_START_IN;       /* 8 bytes in IRQ stack */
-#endif
 
 /* cpu/.../cpu.c */
 int    cpu_init(void);
@@ -56,9 +53,7 @@ int   arch_misc_init(void);
 /* board/.../... */
 int    board_init(void);
 int    dram_init (void);
-#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
 void   dram_init_banksize (void);
-#endif
 void   setup_serial_tag (struct tag **params);
 void   setup_revision_tag (struct tag **params);