[U-Boot-Users] [PATCH][FDT] Conditionally compile fdt_support.c
Kumar Gala
galak at kernel.crashing.org
Mon Nov 26 18:22:37 CET 2007
Modify common/Makefile to conditionally compile fdt_support.c based
on CONFIG_OF_LIBFDT.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
Note, this patch is also in my git tree:
git.kernel.org:/pub/scm/boot/u-boot/galak/u-boot.git
common/Makefile | 3 +--
common/fdt_support.c | 5 -----
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/common/Makefile b/common/Makefile
index ace8cc7..7be89a4 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 c67bb3d..69f4dd5 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 */
--
1.5.3.4
More information about the U-Boot
mailing list