diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2018-10-24 11:30:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:30:18 +0200 |
| commit | 799bbb1d8215d6b5f480dd093d18a0b71f2448e3 (patch) | |
| tree | 1b5db4b973984235c4f6a0dddce140bd895b3ba0 /include/lib/libfdt/fdt.h | |
| parent | dfe5c78e7a42f3360b2c9c6f12fc3838a2c1e21c (diff) | |
| parent | 630b011ffd6a83436581af71d770ddd9fe01f747 (diff) | |
| download | platform_external_arm-trusted-firmware-799bbb1d8215d6b5f480dd093d18a0b71f2448e3.tar.gz platform_external_arm-trusted-firmware-799bbb1d8215d6b5f480dd093d18a0b71f2448e3.tar.bz2 platform_external_arm-trusted-firmware-799bbb1d8215d6b5f480dd093d18a0b71f2448e3.zip | |
Merge pull request #1643 from antonio-nino-diaz-arm/an/libfdt
Update libfdt to version 1.4.7
Diffstat (limited to 'include/lib/libfdt/fdt.h')
| -rw-r--r-- | include/lib/libfdt/fdt.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/lib/libfdt/fdt.h b/include/lib/libfdt/fdt.h index c833dc1b7..74961f902 100644 --- a/include/lib/libfdt/fdt.h +++ b/include/lib/libfdt/fdt.h @@ -1,5 +1,5 @@ -#ifndef _FDT_H -#define _FDT_H +#ifndef FDT_H +#define FDT_H /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2006 David Gibson, IBM Corporation. @@ -52,16 +52,8 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * Portions copyright (c) 2016-2017, ARM Limited and Contributors. - * All rights reserved. - */ - #ifndef __ASSEMBLY__ -#include <libfdt_env.h> - - struct fdt_header { fdt32_t magic; /* magic word FDT_MAGIC */ fdt32_t totalsize; /* total size of DT block */ @@ -88,14 +80,14 @@ struct fdt_reserve_entry { struct fdt_node_header { fdt32_t tag; - char name[]; + char name[0]; }; struct fdt_property { fdt32_t tag; fdt32_t len; fdt32_t nameoff; - char data[]; + char data[0]; }; #endif /* !__ASSEMBLY */ @@ -116,4 +108,4 @@ struct fdt_property { #define FDT_V16_SIZE FDT_V3_SIZE #define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) -#endif /* _FDT_H */ +#endif /* FDT_H */ |