[new uImage] Compilation and new uImage handling fixes for imxtract

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 9ef93444125c458a8e602db73f97313857fd94f1..3351e2c0a6abd6551d4605a78974ad411db263d4 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -103,6 +103,9 @@ typedef volatile unsigned char      vu_char;
 #ifdef CONFIG_ARM
 #define asmlinkage     /* nothing */
 #endif
+#ifdef CONFIG_BLACKFIN
+#include <asm/blackfin.h>
+#endif
 
 #include <part.h>
 #include <flash.h>
@@ -203,8 +206,8 @@ void        init_cmd_timeout(void);
 void   reset_cmd_timeout(void);
 
 /* lib_$(ARCH)/board.c */
-void   board_init_f  (ulong);
-void   board_init_r  (gd_t *, ulong);
+void   board_init_f  (ulong) __attribute__ ((noreturn));
+void   board_init_r  (gd_t *, ulong) __attribute__ ((noreturn));
 int    checkboard    (void);
 int    checkflash    (void);
 int    checkdram     (void);
@@ -219,10 +222,7 @@ int mac_read_from_eeprom(void);
 void flash_perror (int);
 
 /* common/cmd_autoscript.c */
-int    autoscript (ulong addr);
-
-/* common/cmd_bootm.c */
-void   print_image_hdr (image_header_t *hdr);
+int    autoscript (ulong addr, const char *fit_uname);
 
 extern ulong load_addr;                /* Default Load Address */
 
@@ -388,7 +388,7 @@ void        icache_disable(void);
 int    dcache_status (void);
 void   dcache_enable (void);
 void   dcache_disable(void);
-void   relocate_code (ulong, gd_t *, ulong);
+void   relocate_code (ulong, gd_t *, ulong) __attribute__ ((noreturn));
 ulong  get_endaddr   (void);
 void   trap_init     (ulong);
 #if defined (CONFIG_4xx)       || \
@@ -468,7 +468,7 @@ int prt_8260_clks (void);
 #elif defined(CONFIG_MPC5xxx)
 int    prt_mpc5xxx_clks (void);
 #endif
-#if defined(CONFIG_MPC512x)
+#if defined(CONFIG_MPC512X)
 int    prt_mpc512xxx_clks (void);
 #endif
 #if defined(CONFIG_MPC8220)
@@ -479,6 +479,8 @@ ulong       get_OPB_freq (void);
 ulong  get_PCI_freq (void);
 #endif
 #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) || defined(CONFIG_LH7A40X)
+void   s3c2410_irq(void);
+#define ARM920_IRQ_CALLBACK s3c2410_irq
 ulong  get_FCLK (void);
 ulong  get_HCLK (void);
 ulong  get_PCLK (void);
@@ -663,4 +665,6 @@ void inline show_boot_progress (int val);
 #error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
 #endif
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
 #endif /* __COMMON_H_ */