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 41e7a8f7d3f9640063548376345d794d51a5d4e3..e7d58fe8cdae7c9def3297c7650f84279ed68059 100644 (file)
--- a/include/asm-arm/u-boot-arm.h
+++ b/include/asm-arm/u-boot-arm.h
@@ -40,6 +40,9 @@ 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);
@@ -52,7 +55,7 @@ void  setup_revision_tag (struct tag **params);
 /* To be fixed!                                                        */
 /* ------------------------------------------------------------ */
 /* common/cmd_nvedit.c */
-void   setenv          (char *, char *);
+int    setenv          (char *, char *);
 
 /* cpu/.../interrupt.c */
 void   reset_timer_masked      (void);