aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-07-27 16:12:52 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-27 14:09:19 -0500
commit3f0855b14b071655396c71f0d38970b9e21be92f (patch)
treec2947f4db1261f8d8ca62699c5994dac68c6c90c
parent67c0f08d168a2933bf01160592cbe905075cd268 (diff)
Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile.target4
-rwxr-xr-xconfigure3
-rw-r--r--hw/petalogix_s3adsp1800_mmu.c4
-rw-r--r--hw/ppc440_bamboo.c2
-rw-r--r--hw/ppce500_mpc8544ds.c4
-rw-r--r--target-ppc/kvm_ppc.c2
6 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.target b/Makefile.target
index b2237dde9c..687648c0b8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -513,8 +513,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
@@ -541,8 +541,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 df9ade248d..deb62aff00 100755
--- a/configure
+++ b/configure
@@ -1739,7 +1739,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 1a1cc0e371..68a1a6af83 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 624e15b117..5011679ccc 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 04c6acd0d5..d154c7fd7e 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 10cfdb3cf1..6b7f4113c3 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)
{