[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/37] Rename HAVE_FDT to CONFIG_FDT and define it a
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 25/37] Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile |
Date: |
Fri, 17 Jul 2009 21:21:18 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 4 ++--
configure | 3 ++-
hw/petalogix_s3adsp1800_mmu.c | 4 ++--
hw/ppc440_bamboo.c | 2 +-
hw/ppce500_mpc8544ds.c | 4 ++--
target-ppc/kvm_ppc.c | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index f7536af..36222f2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -496,8 +496,8 @@ ifeq ($(TARGET_BASE_ARCH), ppc)
CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
endif
+obj-ppc-$(CONFIG_FDT) += device_tree.o
ifdef FDT_LIBS
-obj-ppc-y += device_tree.o
LIBS+= $(FDT_LIBS)
endif
@@ -524,8 +524,8 @@ obj-microblaze-y += xilinx_ethlite.o
obj-microblaze-y += pflash_cfi02.o
+obj-microblaze-$(CONFIG_FDT) += device_tree.o
ifdef FDT_LIBS
-obj-microblaze-y += device_tree.o
LIBS+= $(FDT_LIBS)
endif
diff --git a/configure b/configure
index cac1711..7e2cca1 100755
--- a/configure
+++ b/configure
@@ -1743,7 +1743,8 @@ if test "$preadv" = "yes" ; then
echo "#define HAVE_PREADV 1" >> $config_host_h
fi
if test "$fdt" = "yes" ; then
- echo "#define HAVE_FDT 1" >> $config_host_h
+ echo "CONFIG_FDT=y" >> $config_host_mak
+ echo "#define CONFIG_FDT 1" >> $config_host_h
echo "FDT_LIBS=-lfdt" >> $config_host_mak
fi
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index c2a196f..63f8655 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -52,14 +52,14 @@ static int petalogix_load_device_tree(target_phys_addr_t
addr,
target_phys_addr_t initrd_size,
const char *kernel_cmdline)
{
-#ifdef HAVE_FDT
+#ifdef CONFIG_FDT
void *fdt;
int r;
#endif
char *path;
int fdt_size;
-#ifdef HAVE_FDT
+#ifdef CONFIG_FDT
/* Try the local "mb.dtb" override. */
fdt = load_device_tree("mb.dtb", &fdt_size);
if (!fdt) {
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index d9ef3ec..bc85646 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -32,7 +32,7 @@ static void *bamboo_load_device_tree(target_phys_addr_t addr,
const char *kernel_cmdline)
{
void *fdt = NULL;
-#ifdef HAVE_FDT
+#ifdef CONFIG_FDT
uint32_t mem_reg_property[] = { 0, 0, ramsize };
char *filename;
int fdt_size;
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index c0e367d..5937dac 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -46,7 +46,7 @@
#define MPC8544_PCI_IO 0xE1000000
#define MPC8544_PCI_IOLEN 0x10000
-#ifdef HAVE_FDT
+#ifdef CONFIG_FDT
static int mpc8544_copy_soc_cell(void *fdt, const char *node, const char *prop)
{
uint32_t cell;
@@ -77,7 +77,7 @@ static void *mpc8544_load_device_tree(target_phys_addr_t addr,
const char *kernel_cmdline)
{
void *fdt = NULL;
-#ifdef HAVE_FDT
+#ifdef CONFIG_FDT
uint32_t mem_reg_property[] = {0, ramsize};
char *filename;
int fdt_size;
diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
index 10cfdb3..6b7f411 100644
--- a/target-ppc/kvm_ppc.c
+++ b/target-ppc/kvm_ppc.c
@@ -21,7 +21,7 @@
static QEMUTimer *kvmppc_timer;
static unsigned int kvmppc_timer_rate;
-#ifdef HAVE_FDT
+#ifdef CONFIG_FDT
int kvmppc_read_host_property(const char *node_path, const char *prop,
void *val, size_t len)
{
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 12/37] generate CPPFLAGS and LIBS on ./configure, (continued)
- [Qemu-devel] [PATCH 16/37] generate CONFIG_WIN32 libraries in configure, quintela, 2009/07/17
- [Qemu-devel] [PATCH 15/37] Add -static in configure if needed, quintela, 2009/07/17
- [Qemu-devel] [PATCH 18/37] fold CURL_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 17/37] fold VDE_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 22/37] fold BLUEZ_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 20/37] fold CURSES_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 19/37] fold BRLAPI_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 23/37] fold VNC_TLS_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 24/37] fold VNC_SASL_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 25/37] Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile,
quintela <=
- [Qemu-devel] [PATCH 21/37] fold XEN_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 27/37] fold FDT_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 26/37] Refactor code to remove one #ifdef CONFIG_FDT, quintela, 2009/07/17
- [Qemu-devel] [PATCH 28/37] fold NEEDS_LIBSUNMATH on generic variables, quintela, 2009/07/17
- [Qemu-devel] [PATCH 32/37] fold DSOUND libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 31/37] fold ALSA libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 30/37] fold OSS_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 29/37] fold FMOD_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 33/37] fold Pulse Audio libs on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 34/37] fold ESD libs on generic LIBS, quintela, 2009/07/17