]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
libfdt: change fdt.h to a wrapper of scripts/dtc/libfdt/*
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 17 Oct 2017 13:30:16 +0000 (22:30 +0900)
committerTom Rini <trini@konsulko.com>
Fri, 17 Nov 2017 12:44:13 +0000 (07:44 -0500)
Fortunately, U-Boot did not modify fdt.h locally.

Change it to a wrapper of scripts/dtc/libfdt/fdt.h, which will be
periodically synced with the upstream DTC (or kernel).

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
include/fdt.h
lib/libfdt/fdt.h [deleted file]

index f40b56c7554546be9bb4363c1b255d0166eff2a7..b97b3f2bccb46b306837c775ee50748a631d3f4c 100644 (file)
@@ -1 +1 @@
-#include "../lib/libfdt/fdt.h"
+#include "../scripts/dtc/libfdt/fdt.h"
diff --git a/lib/libfdt/fdt.h b/lib/libfdt/fdt.h
deleted file mode 100644 (file)
index 3134d78..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _FDT_H
-#define _FDT_H
-/*
- * libfdt - Flat Device Tree manipulation
- * Copyright (C) 2006 David Gibson, IBM Corporation.
- * Copyright 2012 Kim Phillips, Freescale Semiconductor.
- *
- * SPDX-License-Identifier:     GPL-2.0+ BSD-2-Clause
- */
-
-#ifndef __ASSEMBLY__
-
-struct fdt_header {
-       fdt32_t magic;                   /* magic word FDT_MAGIC */
-       fdt32_t totalsize;               /* total size of DT block */
-       fdt32_t off_dt_struct;           /* offset to structure */
-       fdt32_t off_dt_strings;          /* offset to strings */
-       fdt32_t off_mem_rsvmap;          /* offset to memory reserve map */
-       fdt32_t version;                 /* format version */
-       fdt32_t last_comp_version;       /* last compatible version */
-
-       /* version 2 fields below */
-       fdt32_t boot_cpuid_phys;         /* Which physical CPU id we're
-                                           booting on */
-       /* version 3 fields below */
-       fdt32_t size_dt_strings;         /* size of the strings block */
-
-       /* version 17 fields below */
-       fdt32_t size_dt_struct;          /* size of the structure block */
-};
-
-struct fdt_reserve_entry {
-       fdt64_t address;
-       fdt64_t size;
-};
-
-struct fdt_node_header {
-       fdt32_t tag;
-       char name[0];
-};
-
-struct fdt_property {
-       fdt32_t tag;
-       fdt32_t len;
-       fdt32_t nameoff;
-       char data[0];
-};
-
-#endif /* !__ASSEMBLY */
-
-#define FDT_MAGIC      0xd00dfeed      /* 4: version, 4: total size */
-#define FDT_TAGSIZE    sizeof(fdt32_t)
-
-#define FDT_BEGIN_NODE 0x1             /* Start node: full name */
-#define FDT_END_NODE   0x2             /* End node */
-#define FDT_PROP       0x3             /* Property: name off,
-                                          size, content */
-#define FDT_NOP                0x4             /* nop */
-#define FDT_END                0x9
-
-#define FDT_V1_SIZE    (7*sizeof(fdt32_t))
-#define FDT_V2_SIZE    (FDT_V1_SIZE + sizeof(fdt32_t))
-#define FDT_V3_SIZE    (FDT_V2_SIZE + sizeof(fdt32_t))
-#define FDT_V16_SIZE   FDT_V3_SIZE
-#define FDT_V17_SIZE   (FDT_V16_SIZE + sizeof(fdt32_t))
-
-#endif /* _FDT_H */