Skip to contentSkip to conversation

libfdt: add fdt type definitions

PATCH New Rob Herring 1 participant 2 messages Apr 30, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libfdt: add fdt type definitions

In preparation for libfdt/dtc update, add the new fdt specific types.

Cc Russell King <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc linuxppc-dev at lists.ozlabs.org
---
 arch/arm/boot/compressed/libfdt_env.h | 4 ++++
 arch/powerpc/boot/libfdt_env.h        | 4 ++++
 arch/powerpc/boot/of.h                | 2 ++
 include/linux/libfdt_env.h            | 4 ++++
 4 files changed, 14 insertions(+)
arch/arm/boot/compressed/libfdt_env.h +4 -0
index 1f4e718..17ae0f3 100644
@@ -5,6 +5,10 @@
 #include <linux/string.h>
 #include <asm/byteorder.h>
 
+typedef __be16 fdt16_t;
+typedef __be32 fdt32_t;
+typedef __be64 fdt64_t;
+
 #define fdt16_to_cpu(x)		be16_to_cpu(x)
 #define cpu_to_fdt16(x)		cpu_to_be16(x)
 #define fdt32_to_cpu(x)		be32_to_cpu(x)
arch/powerpc/boot/libfdt_env.h +4 -0
index 8dcd744..7e3789e 100644
@@ -10,6 +10,10 @@ typedef u32 uint32_t;
 typedef u64 uint64_t;
 typedef unsigned long uintptr_t;
 
+typedef __be16 fdt16_t;
+typedef __be32 fdt32_t;
+typedef __be64 fdt64_t;
+
 #define fdt16_to_cpu(x)		be16_to_cpu(x)
 #define cpu_to_fdt16(x)		cpu_to_be16(x)
 #define fdt32_to_cpu(x)		be32_to_cpu(x)
arch/powerpc/boot/of.h +2 -0
index 5603320..53f8f27 100644
@@ -21,7 +21,9 @@ int of_setprop(const void *phandle, const char *name, const void *buf,
 /* Console functions */
 void of_console_init(void);
 
+typedef u16			__be16;
 typedef u32			__be32;
+typedef u64			__be64;
 
 #ifdef __LITTLE_ENDIAN__
 #define cpu_to_be16(x) swab16(x)
include/linux/libfdt_env.h +4 -0
index 01508c7..2a663c6 100644
@@ -5,6 +5,10 @@
 
 #include <asm/byteorder.h>
 
+typedef __be16 fdt16_t;
+typedef __be32 fdt32_t;
+typedef __be64 fdt64_t;
+
 #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)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/2 scripts/dtc: Update to upstream version 9d3649bd3be245c9

Sync dtc with upstream as of commit 9d3649bd3be2 (Add testcases for fdt_path_offset_namelen()).

---
 scripts/dtc/checks.c                 |   31 +-
 scripts/dtc/data.c                   |   12 +-
 scripts/dtc/dtc-lexer.l              |   65 +-
 scripts/dtc/dtc-lexer.lex.c_shipped  |  516 +++++-----
 scripts/dtc/dtc-parser.tab.c_shipped | 1773 ++++++++++++++++------------------
 scripts/dtc/dtc-parser.tab.h_shipped |  114 ++-
 scripts/dtc/dtc-parser.y             |  147 +--
 scripts/dtc/dtc.c                    |   14 +-
 scripts/dtc/dtc.h                    |   18 +-
 scripts/dtc/flattree.c               |    4 +-
 scripts/dtc/fstree.c                 |   17 +-
 scripts/dtc/libfdt/Makefile.libfdt   |    3 +-
 scripts/dtc/libfdt/fdt.c             |   30 +-
 scripts/dtc/libfdt/fdt.h             |   93 +-
 scripts/dtc/libfdt/fdt_empty_tree.c  |    1 +
 scripts/dtc/libfdt/fdt_ro.c          |   29 +-
 scripts/dtc/libfdt/fdt_rw.c          |   10 +-
 scripts/dtc/libfdt/fdt_sw.c          |   36 +-
 scripts/dtc/libfdt/fdt_wip.c         |    2 +-
 scripts/dtc/libfdt/libfdt.h          |  148 ++-
 scripts/dtc/libfdt/libfdt_env.h      |  104 +-
 scripts/dtc/libfdt/libfdt_internal.h |    6 +-
 scripts/dtc/livetree.c               |    4 +-
 scripts/dtc/srcpos.c                 |   49 +-
 scripts/dtc/srcpos.h                 |   15 +-
 scripts/dtc/treesource.c             |   15 +-
 scripts/dtc/util.c                   |   18 +-
 scripts/dtc/util.h                   |    4 +-
 scripts/dtc/version_gen.h            |    2 +-
 29 files changed, 1745 insertions(+), 1535 deletions(-)

The patch is quite large, so I've only included the diffstat. The full patch is created by scripts/dtc/update-dtc-source.sh and can be found here[1].

Rob

[1] git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git dtc-import