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 4ca75f9f93d4b13b6a3c1437448ca459e51019b5..c01eef3e6ffcb3e31221faf6bc6d7aae6715ccc0 100644 (file)
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -30,12 +30,8 @@
 #define _U_BOOT_ARM_H_ 1
 
 /* for the following variables, see start.S */
-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 */
-extern ulong _TEXT_BASE;       /* code start */
 extern ulong _datarel_start_ofs;
 extern ulong _datarelrolocal_start_ofs;
 extern ulong _datarellocal_start_ofs;
@@ -52,13 +48,12 @@ void        cpu_init_cp15(void);
 /* cpu/.../arch/cpu.c */
 int    arch_cpu_init(void);
 int    arch_misc_init(void);
+int    arch_early_init_r(void);
 
 /* board/.../... */
 int    board_init(void);
 int    dram_init (void);
 void   dram_init_banksize (void);
-void   setup_serial_tag (struct tag **params);
-void   setup_revision_tag (struct tag **params);
 
 /* cpu/.../interrupt.c */
 int    arch_interrupt_init     (void);