Merge with http://opensource.freescale.com/pub/scm/u-boot-7448hpc2.git

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 9da66b8c275673ba251d6ad8ae3b7710b3b2a34e..b162dbd7cfc421592dc3cf4afa37f5930113d36d 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -113,6 +113,12 @@ typedef volatile unsigned char     vu_char;
 #define debugX(level,fmt,args...)
 #endif /* DEBUG */
 
+#define BUG() do { \
+       printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
+       panic("BUG!"); \
+} while (0)
+#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
+
 typedef void (interrupt_handler_t)(void *);
 
 #include <asm/u-boot.h> /* boot information for Linux kernel */
@@ -181,6 +187,7 @@ void        hang            (void) __attribute__ ((noreturn));
 long int initdram (int);
 int    display_options (void);
 void   print_size (ulong, const char *);
+int    print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
 
 /* common/main.c */
 void   main_loop       (void);
@@ -252,6 +259,9 @@ void        pciinfo       (int, int);
        void    pci_master_init      (struct pci_controller *);
 #   endif
     int            is_pci_host         (struct pci_controller *);
+#if defined(CONFIG_440SPE)
+   void pcie_setup_hoses(void);
+#endif
 #endif
 
 int    misc_init_f   (void);
@@ -261,7 +271,7 @@ int misc_init_r   (void);
 void   jumptable_init(void);
 
 /* common/memsize.c */
-int    get_ram_size  (volatile long *, long);
+long   get_ram_size  (volatile long *, long);
 
 /* $(BOARD)/$(BOARD).c */
 void   reset_phy     (void);
@@ -311,7 +321,8 @@ void        board_ether_init (void);
 
 #if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_MBX) || \
     defined(CONFIG_IAD210)     || defined(CONFIG_XPEDITE1K) || \
-    defined(CONFIG_METROBOX)    || defined(CONFIG_KAREF)
+    defined(CONFIG_METROBOX)    || defined(CONFIG_KAREF) || \
+    defined(CONFIG_V38B)
 void   board_get_enetaddr (uchar *addr);
 #endif
 
@@ -392,6 +403,11 @@ void               ppcSync(void);
 void           ppcDcbz(unsigned long value);
 #endif
 
+#if defined (CONFIG_MPC83XX)
+void           ppcDWload(unsigned int *addr, unsigned int *ret);
+void           ppcDWstore(unsigned int *addr, unsigned int *value);
+#endif
+
 /* $(CPU)/cpu.c */
 int    checkcpu      (void);
 int    checkicache   (void);
@@ -474,6 +490,7 @@ void   get_sys_info  ( sys_info_t * );
 #      if defined(CONFIG_440SPE)
         unsigned long determine_sysper(void);
         unsigned long determine_pci_clock_per(void);
+        int ppc440spe_revB(void);
 #      endif
 #  else
     typedef PPC405_SYS_INFO sys_info_t;
@@ -611,7 +628,7 @@ void        show_boot_progress (int status);
 #endif
 
 #ifdef CONFIG_INIT_CRITICAL
-#error CONFIG_INIT_CRITICAL is depracted!
+#error CONFIG_INIT_CRITICAL is deprecated!
 #error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
 #endif