[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h |
Date: |
Fri, 14 Jun 2013 15:53:10 +0100 |
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>
Reviewed-by: Peter Maydell <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Kim Phillips <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
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 8732185..31b7783 100755
--- a/configure
+++ b/configure
@@ -2488,7 +2488,9 @@ fi
# fdt probe
if test "$fdt" != "no" ; then
fdt_libs="-lfdt"
+ # 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; }
EOF
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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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"
-
-#ifdef HOST_WORDS_BIGENDIAN
-#define fdt32_to_cpu(x) (x)
-#define cpu_to_fdt32(x) (x)
-#define fdt64_to_cpu(x) (x)
-#define cpu_to_fdt64(x) (x)
-#else
-#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
-
-#endif /* _LIBFDT_ENV_H */
--
1.7.9.5
- [Qemu-devel] [PULL 05/10] build: drop TARGET_TYPE, (continued)
- [Qemu-devel] [PULL 05/10] build: drop TARGET_TYPE, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 10/10] ppc: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 07/10] configure: Require libfdt for arm, ppc, microblaze softmmu targets, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 09/10] microblaze: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 08/10] arm: Remove CONFIG_FDT conditionals, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 02/10] build: rename TARGET_ARCH2 to TARGET_NAME, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 01/10] Add a stp file for usage from build directory, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 03/10] build: do not use TARGET_ARCH, Peter Maydell, 2013/06/14
- Re: [Qemu-devel] [PULL 00/10] configury queue, Paolo Bonzini, 2013/06/14
- [Qemu-devel] [PULL 04/10] main: use TARGET_ARCH only for the target-specific #define, Peter Maydell, 2013/06/14
- [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h,
Peter Maydell <=
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Andreas Färber, 2013/06/17
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Peter Maydell, 2013/06/17
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, David Gibson, 2013/06/17
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Andreas Färber, 2013/06/17
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Peter Crosthwaite, 2013/06/17
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Andreas Färber, 2013/06/17
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Paolo Bonzini, 2013/06/18
- Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Peter Maydell, 2013/06/18
Re: [Qemu-devel] [PULL 06/10] configure: dtc: Probe for libfdt_env.h, Cole Robinson, 2013/06/19