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

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

diff --git a/include/asm-arm/u-boot-arm.h b/include/asm-arm/u-boot-arm.h
index 4c92b1f361cb46b213bbdd3a48aacb8e04a48b7f..e7d58fe8cdae7c9def3297c7650f84279ed68059 100644 (file)
--- a/include/asm-arm/u-boot-arm.h
+++ b/include/asm-arm/u-boot-arm.h
@@ -31,8 +31,8 @@
 
 /* for the following variables, see start.S */
 extern ulong _armboot_start;   /* code start */
-extern ulong _armboot_end_data;        /* code + data end */
-extern ulong _armboot_end;     /* BSS end */
+extern ulong _bss_start;       /* code + data end == BSS start */
+extern ulong _bss_end;         /* BSS end */
 extern ulong IRQ_STACK_START;  /* top of IRQ stack */
 extern ulong FIQ_STACK_START;  /* top of FIQ stack */
 
@@ -40,9 +40,14 @@ extern ulong FIQ_STACK_START;        /* top of FIQ stack */
 int    cpu_init(void);
 int    cleanup_before_linux(void);
 
+/* cpu/.../arch/cpu.c */
+int    arch_cpu_init(void);
+
 /* board/.../... */
 int    board_init(void);
 int    dram_init (void);
+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 */
@@ -50,7 +55,7 @@ int   dram_init (void);
 /* To be fixed!                                                        */
 /* ------------------------------------------------------------ */
 /* common/cmd_nvedit.c */
-void   setenv          (char *, char *);
+int    setenv          (char *, char *);
 
 /* cpu/.../interrupt.c */
 void   reset_timer_masked      (void);