summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-11-26 11:19:12 -0600
committerGerald Van Baren <vanbaren@cideas.com>2007-12-07 20:51:25 -0500
commit9c9109e7fcf7ac2ca19c95b8ac54b8d1c773b157 (patch)
tree95720c3ef7ba646c64204957bc9edd5899f27b5e /common
parentd88e7ba0980773479e1a64badb293116071b7ef0 (diff)
downloadtalos-obmc-uboot-9c9109e7fcf7ac2ca19c95b8ac54b8d1c773b157.tar.gz
talos-obmc-uboot-9c9109e7fcf7ac2ca19c95b8ac54b8d1c773b157.zip
Conditionally compile fdt_support.c
Modify common/Makefile to conditionally compile fdt_support.c based on CONFIG_OF_LIBFDT. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'common')
-rw-r--r--common/Makefile3
-rw-r--r--common/fdt_support.c5
2 files changed, 1 insertions, 7 deletions
diff --git a/common/Makefile b/common/Makefile
index ace8cc7edc..7be89a41c6 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -55,7 +55,7 @@ COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
COBJS-y += cmd_fdc.o
-COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o
+COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
ifdef CONFIG_FPGA
@@ -105,7 +105,6 @@ COBJS-y += env_onenand.o
COBJS-y += env_nvram.o
COBJS-y += env_nowhere.o
COBJS-y += exports.o
-COBJS-y += fdt_support.o
COBJS-y += flash.o
COBJS-y += fpga.o
COBJS-y += ft_build.o
diff --git a/common/fdt_support.c b/common/fdt_support.c
index c67bb3d390..69f4dd552a 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -24,9 +24,6 @@
#include <common.h>
#include <linux/ctype.h>
#include <linux/types.h>
-
-#ifdef CONFIG_OF_LIBFDT
-
#include <asm/global_data.h>
#include <fdt.h>
#include <libfdt.h>
@@ -486,5 +483,3 @@ void fdt_fixup_ethernet(void *fdt, bd_t *bd)
#endif
}
}
-
-#endif /* CONFIG_OF_LIBFDT */
OpenPOWER on IntegriCloud