From: Sebastien Carlier Date: Thu, 18 Nov 2010 11:06:46 +0000 (+0100) Subject: Exclude drivers/qe/fdt.c without CONFIG_QE X-Git-Tag: v2010.12-rc2~48 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c05b18fd7768cb95cf8a1307b957992ff0aac058;p=oweals%2Fu-boot.git Exclude drivers/qe/fdt.c without CONFIG_QE Previously with archive libraries fdt.o was compiled and included in qe.a and then discarded by the linker. With partial linking this results in unresolved symbols, which this commit fixes. This commit also cleans up a now-useless conditional in fdt.c. Signed-off-by: Sebastien Carlier Tested-by: Wolfgang Denk --- diff --git a/drivers/qe/Makefile b/drivers/qe/Makefile index 8e9a035e92..ef4bdf8b24 100644 --- a/drivers/qe/Makefile +++ b/drivers/qe/Makefile @@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libqe.o -COBJS-$(CONFIG_OF_LIBFDT) += fdt.o +COBJS-$(and $(CONFIG_QE),$(CONFIG_OF_LIBFDT)) += fdt.o COBJS-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o COBJS := $(COBJS-y) diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c index d7c7d13cab..73e9060d57 100644 --- a/drivers/qe/fdt.c +++ b/drivers/qe/fdt.c @@ -74,7 +74,6 @@ error: void ft_qe_setup(void *blob) { -#ifdef CONFIG_QE do_fixup_by_prop_u32(blob, "device_type", "qe", 4, "bus-frequency", gd->qe_clk, 1); do_fixup_by_prop_u32(blob, "device_type", "qe", 4, @@ -88,5 +87,4 @@ void ft_qe_setup(void *blob) do_fixup_by_compat_u32(blob, "fsl,qe-gtm", "clock-frequency", gd->qe_clk / 2, 1); fdt_fixup_qe_firmware(blob); -#endif }