diff options
| author | Sebastien Carlier <sebastien.carlier@gmail.com> | 2010-11-18 12:06:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-18 15:22:10 +0100 |
| commit | c05b18fd7768cb95cf8a1307b957992ff0aac058 (patch) | |
| tree | e8fccbee952a4de613f33cca6bb3bfd505bb30a0 /drivers/qe | |
| parent | 635d1b3e1b885267de90d100402ba7748fdd9bc5 (diff) | |
| download | blackbird-obmc-uboot-c05b18fd7768cb95cf8a1307b957992ff0aac058.tar.gz blackbird-obmc-uboot-c05b18fd7768cb95cf8a1307b957992ff0aac058.zip | |
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 <sebastien.carlier@gmail.com>
Tested-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/qe')
| -rw-r--r-- | drivers/qe/Makefile | 2 | ||||
| -rw-r--r-- | drivers/qe/fdt.c | 2 |
2 files changed, 1 insertions, 3 deletions
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 } |
