Add PCI support for MPC8250 Boards (PM825 module)

[karo-tx-uboot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index a950cdcc40cbebddd60a74f5b31cc00ca74f2f1e..ac2a57d9a329c7337d1f00a68b770a60d322ac3d 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -80,6 +80,18 @@ typedef      void (interrupt_handler_t)(void *);
 #endif
 
 
+/*
+ * General Purpose Utilities
+ */
+#define min(X, Y)                              \
+       ({ typeof (X) __x = (X), __y = (Y);     \
+               (__x < __y) ? __x : __y; })
+
+#define max(X, Y)                              \
+       ({ typeof (X) __x = (X), __y = (Y);     \
+               (__x > __y) ? __x : __y; })
+
+
 /*
  * Function Prototypes
  */
@@ -137,10 +149,11 @@ void    setenv       (char *, char *);
 # include <asm/u-boot-arm.h>   /* ARM version to be fixed! */
 #endif /* CONFIG_ARM */
 #ifdef CONFIG_I386             /* x86 version to be fixed! */
-# include <asm/ppcboot-i386.h>  
+# include <asm/u-boot-i386.h>  
 #endif /* CONFIG_I386 */
 
 void    pci_init      (void);
+void    pci_init_board(void);
 void    pciinfo       (int, int);
 
 #if defined(CONFIG_PCI) && defined(CONFIG_440)