Merge branch 'master' of git://git.denx.de/u-boot-arm into master

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

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 671c3a8981ad5071f3ec024fc97649a6ec93a7f4..273b5d30f867265dd364a2502946661b39e64359 100644 (file)
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -3,51 +3,27 @@
  * Copyright (C) 2007 Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
  * Original version written by David Gibson, IBM Corporation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * SPDX-License-Identifier:    LGPL-2.1+
  */
 
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
-#ifdef USE_HOSTCC
-#include <stdint.h>
-#include <string.h>
-#else
-#include <linux/string.h>
-#include <linux/types.h>
-#endif /* USE_HOSTCC */
+#include "compiler.h"
+#include "linux/types.h"
 
-#include <stddef.h>
-#include <asm/byteorder.h>
 extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
 
-#define fdt32_to_cpu(x)                __be32_to_cpu(x)
-#define cpu_to_fdt32(x)                __cpu_to_be32(x)
-#define fdt64_to_cpu(x)                __be64_to_cpu(x)
-#define cpu_to_fdt64(x)                __cpu_to_be64(x)
+typedef __be16 fdt16_t;
+typedef __be32 fdt32_t;
+typedef __be64 fdt64_t;
 
-/*
- * Types for `void *' pointers.
- *
- * Note: libfdt uses this definition from /usr/include/stdint.h.
- * Define it here rather than pulling in all of stdint.h.
- */
-#if __WORDSIZE == 64
-typedef unsigned long int       uintptr_t;
-#else
-typedef unsigned int            uintptr_t;
-#endif
+#define fdt32_to_cpu(x)                be32_to_cpu(x)
+#define cpu_to_fdt32(x)                cpu_to_be32(x)
+#define fdt64_to_cpu(x)                be64_to_cpu(x)
+#define cpu_to_fdt64(x)                cpu_to_be64(x)
+
+/* adding a ramdisk needs 0x44 bytes in version 2008.10 */
+#define FDT_RAMDISK_OVERHEAD   0x80
 
 #endif /* _LIBFDT_ENV_H */