Fix merge problems

[u-boot] / include / ppc4xx.h

diff --git a/include/ppc4xx.h b/include/ppc4xx.h
index d593b072fcdf603a4b26f8eb443ee4875cef7771..c71da6084405cedde696408679eedab84e134faf 100644 (file)
--- a/include/ppc4xx.h
+++ b/include/ppc4xx.h
@@ -47,6 +47,12 @@
 #endif
 
 #if defined(CONFIG_440)
+/*
+ * Enable long long (%ll ...) printf format on 440 PPC's since most of
+ * them support 36bit physical addressing
+ */
+#define CFG_64BIT_VSPRINTF
+#define CFG_64BIT_STRTOUL
 #include <ppc440.h>
 #else
 #include <ppc405.h>
@@ -54,7 +60,9 @@
 
 #include <asm/ppc4xx-sdram.h>
 #include <asm/ppc4xx-ebc.h>
+#if !defined(CONFIG_XILINX_440)
 #include <asm/ppc4xx-uic.h>
+#endif
 
 /*
  * Macro for generating register field mnemonics