[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v2 1/1] configure: dtc: Probe for libfdt_env.h

From: peter . crosthwaite
Subject: [Qemu-devel] [PATCH v2 1/1] configure: dtc: Probe for libfdt_env.h
Date: Mon, 27 May 2013 14:20:57 +1000

From: Peter Crosthwaite <address@hidden>

Currently QEMU provides a local clone of the file libfdt_env.h in
/include. This file is supposed to come with the libfdt package and is
only needed for broken installs of libfdt. Now that we have submodule
dtc, just ignore these broken installs and prompt for the dtc submodule
install instead. QEMU's local libfdt_env.h is removed accordingly.

Manifests as a bug when building QEMU with modern libfdt. The new
version of libfdt does not compile when QEMUs libfdt_env.h takes
precedence over the hosts.

Signed-off-by: Peter Crosthwaite <address@hidden>
changed since V1:
Just fallback to submodule rather than provide libfdt_env.h

I suggest this patch goes in behind PMMs patches to make dtc
compulsory for PPC/MB/ARM to avoid silent regressions for current
users of dtc 1.3.0.

To replicate bug (install latest dtc from src to host and make):
git submodule update --init dtc
cd dtc
git checkout master
sudo make install PREFIX=/usr/local
cd ..
./configure --target-list="arm-softmmu" --enable-fdt

 configure            |  2 ++
 include/libfdt_env.h | 36 ------------------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 include/libfdt_env.h

diff --git a/configure b/configure
index eb74510..87bc9a7 100755
--- a/configure
+++ b/configure
@@ -2519,7 +2519,9 @@ fi
 # fdt probe
 if test "$fdt" != "no" ; then
+  # explicitly check for libfdt_env.h as it is missing in some stable installs
   cat > $TMPC << EOF
+#include <libfdt_env.h>
 int main(void) { return 0; }
   if compile_prog "" "$fdt_libs" ; then
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
deleted file mode 100644
index 3667d4c..0000000
--- a/include/libfdt_env.h
+++ /dev/null
@@ -1,36 +0,0 @@
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * GNU General Public License for more details.
- *
- * 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 <address@hidden>
- *
- */
-#ifndef _LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
-#include "qemu/bswap.h"
-#define fdt32_to_cpu(x)  (x)
-#define cpu_to_fdt32(x)  (x)
-#define fdt64_to_cpu(x)  (x)
-#define cpu_to_fdt64(x)  (x)
-#define fdt32_to_cpu(x)  bswap32(x)
-#define cpu_to_fdt32(x)  bswap32(x)
-#define fdt64_to_cpu(x)  bswap64(x)
-#define cpu_to_fdt64(x)  bswap64(x)
-#endif /* _LIBFDT_ENV_H */

reply via email to

[Prev in Thread] Current Thread [Next in Thread]