imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / include / asm-ppc / types.h

diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h
index 4ebbb9e028b3116a52d243e671f56793c9ff343d..b27a6b753a06cb02f55d187badc8e2f915af761d 100755 (executable)
--- a/include/asm-ppc/types.h
+++ b/include/asm-ppc/types.h
@@ -14,14 +14,14 @@ typedef unsigned short __u16;
 typedef __signed__ int __s32;
 typedef unsigned int __u32;
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+#if defined(__GNUC__)
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
 #endif
 
 typedef struct {
        __u32 u[4];
-} __attribute((aligned(16))) vector128;
+} __attribute__((aligned(16))) vector128;
 
 #ifdef __KERNEL__
 /*
@@ -44,6 +44,14 @@ typedef unsigned long long u64;
 /* DMA addresses are 32-bits wide */
 typedef u32 dma_addr_t;
 
+#ifdef CONFIG_PHYS_64BIT
+typedef unsigned long long phys_addr_t;
+typedef unsigned long long phys_size_t;
+#else
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */