Skip to content
Snippets Groups Projects
Commit c05b18fd authored by Sebastien Carlier's avatar Sebastien Carlier Committed by Wolfgang Denk
Browse files

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: default avatarSebastien Carlier <sebastien.carlier@gmail.com>
Tested-by: default avatarWolfgang Denk <wd@denx.de>
parent 635d1b3e
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ include $(TOPDIR)/config.mk ...@@ -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)
......
...@@ -74,7 +74,6 @@ error: ...@@ -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) ...@@ -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
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment