Merge with http://www.jdl.com/software/u-boot-86xx.git

[u-boot] / include / common.h

diff --git a/include/common.h b/include/common.h
index 8000dd01f3a6de87d9b785132bb7504a07fd05e9..349d5cf726bdc833937267b97a57e2eba19c6fa9 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 */
@@ -314,7 +320,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