From: Andre Przywara <andre.przywara@linaro.org>
To: aliguori@us.ibm.com
Cc: jdl@jdl.com, kim.phillips@freescale.com, qemu-devel@nongnu.org,
hollisb@us.ibm.com, Andre Przywara <andre.przywara@linaro.org>
Subject: [Qemu-devel] [PATCH] fdt: update embedded header file from upstream to fix compilation
Date: Tue, 7 May 2013 14:36:59 +0200 [thread overview]
Message-ID: <1367930219-14361-1-git-send-email-andre.przywara@linaro.org> (raw)
Upstream dtc.git introduced a change in libfdt_env.h, which breaks
compilation with QEMU's version of it:
CC arm-softmmu/device_tree.o
In file included from /usr/include/libfdt.h:55:0,
from /src/qemu.git/device_tree.c:28:
/usr/include/fdt.h:7:2: error: unknown type name 'fdt32_t'
...
The culprit is:
commit feafcd972cb744750a65728440c99526e6199a6d
Author: Kim Phillips <kim.phillips@freescale.com>
Date: Wed Nov 28 17:33:01 2012 -0600
dtc/libfdt: introduce fdt types for annotation by endian checkers
...
Pull the new definitions into QEMU's version of the file. This change
also works with older installed versions of dtc.
The upstream version got a "GPL or BSD" dual license header meanwhile.
I retained the original GPL license header from QEMU, only added
the original copyrights.
Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
---
include/libfdt_env.h | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 3667d4c..aad54bb 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -1,4 +1,12 @@
+#ifndef _LIBFDT_ENV_H
+#define _LIBFDT_ENV_H
/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ * Copyright 2012 Kim Phillips, Freescale Semiconductor.
+ * Adaptation to QEMU: Copyright IBM Corp. 2008
+ * by Hollis Blanchard <hollisb@us.ibm.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
* published by the Free Software Foundation.
@@ -11,16 +19,23 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
- * Copyright IBM Corp. 2008
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
*
*/
-#ifndef _LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
-
#include "qemu/bswap.h"
+#ifdef __CHECKER__
+#define __force __attribute__((force))
+#define __bitwise __attribute__((bitwise))
+#else
+#define __force
+#define __bitwise
+#endif
+
+typedef uint16_t __bitwise fdt16_t;
+typedef uint32_t __bitwise fdt32_t;
+typedef uint64_t __bitwise fdt64_t;
+
#ifdef HOST_WORDS_BIGENDIAN
#define fdt32_to_cpu(x) (x)
#define cpu_to_fdt32(x) (x)
--
1.7.12.1
next reply other threads:[~2013-05-07 12:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 12:36 Andre Przywara [this message]
2013-05-07 12:44 ` [Qemu-devel] [PATCH] fdt: update embedded header file from upstream to fix compilation Peter Maydell
2013-05-07 12:52 ` Andre Przywara
2013-05-07 13:24 ` Peter Maydell
2013-05-07 14:00 ` Andre Przywara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367930219-14361-1-git-send-email-andre.przywara@linaro.org \
--to=andre.przywara@linaro.org \
--cc=aliguori@us.ibm.com \
--cc=hollisb@us.ibm.com \
--cc=jdl@jdl.com \
--cc=kim.phillips@freescale.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).