Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.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 4ac4f612e940ff5d6d8ffde6b0dc9d77aae43e6d..c01eef3e6ffcb3e31221faf6bc6d7aae6715ccc0 100644 (file)
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -30,45 +30,30 @@
 #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 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_ofs;       /* code start */
-#else
-extern ulong _TEXT_BASE;       /* code 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);
 int    cleanup_before_linux(void);
 
+/* Set up ARMv7 MMU, caches and TLBs */
+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);
-#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);
-
-/* ------------------------------------------------------------ */
-/* Here is a list of some prototypes which are incompatible to */
-/* the U-Boot implementation                                   */
-/* To be fixed!                                                        */
-/* ------------------------------------------------------------ */
-/* common/cmd_nvedit.c */
-int    setenv          (char *, char *);
 
 /* cpu/.../interrupt.c */
 int    arch_interrupt_init     (void);
@@ -76,7 +61,4 @@ void  reset_timer_masked      (void);
 ulong  get_timer_masked        (void);
 void   udelay_masked           (unsigned long usec);
 
-/* cpu/.../timer.c */
-int    timer_init              (void);
-
 #endif /* _U_BOOT_ARM_H_ */