Merge branch 'master' of git://git.denx.de/u-boot-video

[karo-tx-uboot.git] / board / freescale / common / Makefile

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 9bdf45b7289a9374d164a7c0a6e35f5a79cd8039..54cb098a9159d54ef51f54202bf14541388dbbc1 100644 (file)
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -34,11 +34,12 @@ COBJS-$(CONFIG_FSL_VIA)             += cds_via.o
 COBJS-$(CONFIG_FMAN_ENET)      += fman.o
 COBJS-$(CONFIG_FSL_PIXIS)      += pixis.o
 COBJS-$(CONFIG_FSL_NGPIXIS)    += ngpixis.o
+COBJS-$(CONFIG_FSL_QIXIS)      += qixis.o
 COBJS-$(CONFIG_PQ_MDS_PIB)     += pq-mds-pib.o
 COBJS-$(CONFIG_ID_EEPROM)      += sys_eeprom.o
 COBJS-$(CONFIG_FSL_SGMII_RISER)        += sgmii_riser.o
 ifndef CONFIG_RAMBOOT_PBL
-COBJS-$(CONFIG_ENV_IS_IN_MMC)  += sdhc_boot.o
+COBJS-$(CONFIG_FSL_FIXED_MMC_LOCATION) += sdhc_boot.o
 endif
 
 COBJS-$(CONFIG_MPC8541CDS)     += cds_pci_ft.o
@@ -53,18 +54,22 @@ COBJS-$(CONFIG_P3041DS)             += ics307_clk.o
 COBJS-$(CONFIG_P4080DS)                += ics307_clk.o
 COBJS-$(CONFIG_P5020DS)                += ics307_clk.o
 
+# deal with common files for P-series corenet based devices
+SUBLIB-$(CONFIG_P2041RDB)      += p_corenet/libp_corenet.o
+SUBLIB-$(CONFIG_P3041DS)       += p_corenet/libp_corenet.o
+SUBLIB-$(CONFIG_P4080DS)       += p_corenet/libp_corenet.o
+SUBLIB-$(CONFIG_P5020DS)       += p_corenet/libp_corenet.o
+
 SRCS   := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
+SUBLIB := $(addprefix $(obj),$(SUBLIB-y))
 
-$(LIB):        $(obj).depend $(OBJS)
-       $(call cmd_link_o_target, $(OBJS))
-
-clean:
-       rm -f $(SOBJS) $(OBJS)
+$(LIB):        $(obj).depend $(OBJS) $(SUBLIB)
+       $(call cmd_link_o_target, $(OBJS) $(SUBLIB))
 
-distclean:     clean
-       rm -f $(LIB) core *.bak $(obj).depend
+$(SUBLIB): $(obj).depend
+       $(MAKE) -C $(dir $(subst $(obj),,$@))
 
 #########################################################################