phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Sebastien Carlier 2010-11-18 12:06:46 +01:00 committed by Wolfgang Denk
parent 635d1b3e1b
commit c05b18fd77
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/qe/Makefile
View File

@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libqe.o 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-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)

2
drivers/qe/fdt.c
View File

@ -74,7 +74,6 @@ error:
void ft_qe_setup(void *blob) void ft_qe_setup(void *blob)
{ {
#ifdef CONFIG_QE
do_fixup_by_prop_u32(blob, "device_type", "qe", 4, do_fixup_by_prop_u32(blob, "device_type", "qe", 4,
"bus-frequency", gd->qe_clk, 1); "bus-frequency", gd->qe_clk, 1);
do_fixup_by_prop_u32(blob, "device_type", "qe", 4, 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", do_fixup_by_compat_u32(blob, "fsl,qe-gtm",
"clock-frequency", gd->qe_clk / 2, 1); "clock-frequency", gd->qe_clk / 2, 1);
fdt_fixup_qe_firmware(blob); fdt_fixup_qe_firmware(blob);
#endif
} }