Merge git://git.denx.de/u-boot-sunxi

[u-boot] / common / image-fdt.c

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 1e946467e3c762fe03271ad454fab0ece787a207..3dc02a12191d515fc19e10ba3abfe8c55633d234 100644 (file)
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -13,7 +13,7 @@
 #include <fdt_support.h>
 #include <errno.h>
 #include <image.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <mapmem.h>
 #include <asm/io.h>
 
@@ -21,6 +21,9 @@
 #define CONFIG_SYS_FDT_PAD 0x3000
 #endif
 
+/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
+#define FDT_RAMDISK_OVERHEAD   0x80
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static void fdt_error(const char *msg)
@@ -454,6 +457,11 @@ __weak int ft_verify_fdt(void *fdt)
        return 1;
 }
 
+__weak int arch_fixup_fdt(void *blob)
+{
+       return 0;
+}
+
 int image_setup_libfdt(bootm_headers_t *images, void *blob,
                       int of_size, struct lmb *lmb)
 {