[U-Boot] [PATCH] Makefile: change LIB to LIB-y
Use LIB-y and LIB-$(xxx) for appending libraries. Also allow appending to LIB-y in sub-makefiles.
The top Makefile and the SPL Makefile have lines like those:
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) LIBS-y += $(CPUDIR)/imx-common/libimx-common.o endif
This should be done in the arch/CPU/SoC specific sub-makefiles to keep the top Makefiles clean. This patch also allows adding of new arch/CPU/SoC specific libraries in the future without touching the top Makefiles.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com --- Makefile | 144 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 70 insertions(+), 74 deletions(-)
diff --git a/Makefile b/Makefile index 0197239..cf3c56d 100644 --- a/Makefile +++ b/Makefile @@ -225,105 +225,101 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
-LIBS = lib/libgeneric.o -LIBS += lib/lzma/liblzma.o -LIBS += lib/lzo/liblzo.o -LIBS += lib/zlib/libz.o -ifeq ($(CONFIG_TIZEN),y) -LIBS += lib/tizen/libtizen.o -endif -LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ - "board/$(VENDOR)/common/lib$(VENDOR).o"; fi) -LIBS += $(CPUDIR)/lib$(CPU).o +HAVE_VENDOR_COMMON_LIB := $(shell [ -f board/$(VENDOR)/common/Makefile ] \ + && echo y || echo n) + +LIBS-y += lib/libgeneric.o +LIBS-y += lib/lzma/liblzma.o +LIBS-y += lib/lzo/liblzo.o +LIBS-y += lib/zlib/libz.o +LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o +LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o +LIBS-y += $(CPUDIR)/lib$(CPU).o ifdef SOC -LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o +LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o endif ifeq ($(CPU),ixp) -LIBS += arch/arm/cpu/ixp/npe/libnpe.o -endif -ifeq ($(CONFIG_OF_EMBED),y) -LIBS += dts/libdts.o +LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o endif -LIBS += arch/$(ARCH)/lib/lib$(ARCH).o -LIBS += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ +LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o +LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o +LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \ fs/ubifs/libubifs.o -LIBS += net/libnet.o -LIBS += disk/libdisk.o -LIBS += drivers/bios_emulator/libatibiosemu.o -LIBS += drivers/block/libblock.o -LIBS += drivers/dma/libdma.o -LIBS += drivers/fpga/libfpga.o -LIBS += drivers/gpio/libgpio.o -LIBS += drivers/hwmon/libhwmon.o -LIBS += drivers/i2c/libi2c.o -LIBS += drivers/input/libinput.o -LIBS += drivers/misc/libmisc.o -LIBS += drivers/mmc/libmmc.o -LIBS += drivers/mtd/libmtd.o -LIBS += drivers/mtd/nand/libnand.o -LIBS += drivers/mtd/onenand/libonenand.o -LIBS += drivers/mtd/ubi/libubi.o -LIBS += drivers/mtd/spi/libspi_flash.o -LIBS += drivers/net/libnet.o -LIBS += drivers/net/phy/libphy.o -LIBS += drivers/pci/libpci.o -LIBS += drivers/pcmcia/libpcmcia.o -LIBS += drivers/power/libpower.o -LIBS += drivers/spi/libspi.o +LIBS-y += net/libnet.o +LIBS-y += disk/libdisk.o +LIBS-y += drivers/bios_emulator/libatibiosemu.o +LIBS-y += drivers/block/libblock.o +LIBS-y += drivers/dma/libdma.o +LIBS-y += drivers/fpga/libfpga.o +LIBS-y += drivers/gpio/libgpio.o +LIBS-y += drivers/hwmon/libhwmon.o +LIBS-y += drivers/i2c/libi2c.o +LIBS-y += drivers/input/libinput.o +LIBS-y += drivers/misc/libmisc.o +LIBS-y += drivers/mmc/libmmc.o +LIBS-y += drivers/mtd/libmtd.o +LIBS-y += drivers/mtd/nand/libnand.o +LIBS-y += drivers/mtd/onenand/libonenand.o +LIBS-y += drivers/mtd/ubi/libubi.o +LIBS-y += drivers/mtd/spi/libspi_flash.o +LIBS-y += drivers/net/libnet.o +LIBS-y += drivers/net/phy/libphy.o +LIBS-y += drivers/pci/libpci.o +LIBS-y += drivers/pcmcia/libpcmcia.o +LIBS-y += drivers/power/libpower.o +LIBS-y += drivers/spi/libspi.o ifeq ($(CPU),mpc83xx) -LIBS += drivers/qe/libqe.o -LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o -LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o +LIBS-y += drivers/qe/libqe.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc85xx) -LIBS += drivers/qe/libqe.o -LIBS += drivers/net/fm/libfm.o -LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o -LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o +LIBS-y += drivers/qe/libqe.o +LIBS-y += drivers/net/fm/libfm.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc86xx) -LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o -LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o -endif -LIBS += drivers/rtc/librtc.o -LIBS += drivers/serial/libserial.o -ifeq ($(CONFIG_GENERIC_LPC_TPM),y) -LIBS += drivers/tpm/libtpm.o -endif -LIBS += drivers/twserial/libtws.o -LIBS += drivers/usb/eth/libusb_eth.o -LIBS += drivers/usb/gadget/libusb_gadget.o -LIBS += drivers/usb/host/libusb_host.o -LIBS += drivers/usb/musb/libusb_musb.o -LIBS += drivers/usb/phy/libusb_phy.o -LIBS += drivers/usb/ulpi/libusb_ulpi.o -LIBS += drivers/video/libvideo.o -LIBS += drivers/watchdog/libwatchdog.o -LIBS += common/libcommon.o -LIBS += lib/libfdt/libfdt.o -LIBS += api/libapi.o -LIBS += post/libpost.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o +endif +LIBS-y += drivers/rtc/librtc.o +LIBS-y += drivers/serial/libserial.o +LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o +LIBS-y += drivers/twserial/libtws.o +LIBS-y += drivers/usb/eth/libusb_eth.o +LIBS-y += drivers/usb/gadget/libusb_gadget.o +LIBS-y += drivers/usb/host/libusb_host.o +LIBS-y += drivers/usb/musb/libusb_musb.o +LIBS-y += drivers/usb/phy/libusb_phy.o +LIBS-y += drivers/usb/ulpi/libusb_ulpi.o +LIBS-y += drivers/video/libvideo.o +LIBS-y += drivers/watchdog/libwatchdog.o +LIBS-y += common/libcommon.o +LIBS-y += lib/libfdt/libfdt.o +LIBS-y += api/libapi.o +LIBS-y += post/libpost.o
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) -LIBS += $(CPUDIR)/omap-common/libomap-common.o +LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) -LIBS += $(CPUDIR)/imx-common/libimx-common.o +LIBS-y += $(CPUDIR)/imx-common/libimx-common.o endif ifeq ($(SOC),mx6) -LIBS += $(CPUDIR)/imx-common/libimx-common.o +LIBS-y += $(CPUDIR)/imx-common/libimx-common.o endif
ifeq ($(SOC),s5pc1xx) -LIBS += $(CPUDIR)/s5p-common/libs5p-common.o +LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o endif ifeq ($(SOC),exynos) -LIBS += $(CPUDIR)/s5p-common/libs5p-common.o +LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o endif
-LIBS := $(addprefix $(obj),$(sort $(LIBS))) +LIBS := $(addprefix $(obj),$(sort $(LIBS-y))) .PHONY : $(LIBS)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
Dear Daniel Schwierzeck,
In message 1340887200-535-1-git-send-email-daniel.schwierzeck@gmail.com you wrote:
Use LIB-y and LIB-$(xxx) for appending libraries. Also allow appending to LIB-y in sub-makefiles.
The top Makefile and the SPL Makefile have lines like those:
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) LIBS-y += $(CPUDIR)/imx-common/libimx-common.o endif
This should be done in the arch/CPU/SoC specific sub-makefiles to keep the top Makefiles clean. This patch also allows adding of new arch/CPU/SoC specific libraries in the future without touching the top Makefiles.
Please split into two patches: one that introduces LIBS-y, and another one, that adds the extensions.
Best regards,
Wolfgang Denk
The top Makefile and the SPL Makefile have lines like those:
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) LIBS += $(CPUDIR)/imx-common/libimx-common.o endif
This should be done in the arch/CPU/SoC specific sub-makefiles to keep the top Makefiles clean. This patch also allows adding of new arch/CPU/SoC specific libraries in the future without touching the top Makefiles.
This series splits the patch in http://patchwork.ozlabs.org/patch/167866/ as demanded by Wolfgang.
Daniel Schwierzeck (3): Makefile: allow appending to LIB in sub-makefiles Makefile: replace LIBS by LIBS-y Makefile: cosmetic: optimize usage of LIBS-y
Makefile | 144 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 70 insertions(+), 74 deletions(-)
-- 1.7.11.1
The top Makefile and the SPL Makefile have lines like those:
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) LIBS += $(CPUDIR)/imx-common/libimx-common.o endif
This should be done in the arch/CPU/SoC specific sub-makefiles to keep the top Makefiles clean. This patch also allows adding of new arch/CPU/SoC specific libraries in the future without touching the top Makefiles.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 0197239..b5fafc7 100644 --- a/Makefile +++ b/Makefile @@ -225,7 +225,7 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
-LIBS = lib/libgeneric.o +LIBS += lib/libgeneric.o LIBS += lib/lzma/liblzma.o LIBS += lib/lzo/liblzo.o LIBS += lib/zlib/libz.o
Acked-by: Mike Frysinger vapier@gentoo.org -mike
Dear Daniel Schwierzeck,
In message 1340901921-9868-2-git-send-email-daniel.schwierzeck@gmail.com you wrote:
The top Makefile and the SPL Makefile have lines like those:
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) LIBS += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) LIBS += $(CPUDIR)/imx-common/libimx-common.o endif
This should be done in the arch/CPU/SoC specific sub-makefiles to keep the top Makefiles clean. This patch also allows adding of new arch/CPU/SoC specific libraries in the future without touching the top Makefiles.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Synchronize with ALL-y handling and code in spl/Makefile.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com --- Makefile | 134 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/Makefile b/Makefile index b5fafc7..2bde73c 100644 --- a/Makefile +++ b/Makefile @@ -225,105 +225,105 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
-LIBS += lib/libgeneric.o -LIBS += lib/lzma/liblzma.o -LIBS += lib/lzo/liblzo.o -LIBS += lib/zlib/libz.o +LIBS-y += lib/libgeneric.o +LIBS-y += lib/lzma/liblzma.o +LIBS-y += lib/lzo/liblzo.o +LIBS-y += lib/zlib/libz.o ifeq ($(CONFIG_TIZEN),y) -LIBS += lib/tizen/libtizen.o +LIBS-y += lib/tizen/libtizen.o endif -LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ +LIBS-y += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ "board/$(VENDOR)/common/lib$(VENDOR).o"; fi) -LIBS += $(CPUDIR)/lib$(CPU).o +LIBS-y += $(CPUDIR)/lib$(CPU).o ifdef SOC -LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o +LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o endif ifeq ($(CPU),ixp) -LIBS += arch/arm/cpu/ixp/npe/libnpe.o +LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o endif ifeq ($(CONFIG_OF_EMBED),y) -LIBS += dts/libdts.o +LIBS-y += dts/libdts.o endif -LIBS += arch/$(ARCH)/lib/lib$(ARCH).o -LIBS += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ +LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o +LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \ fs/ubifs/libubifs.o -LIBS += net/libnet.o -LIBS += disk/libdisk.o -LIBS += drivers/bios_emulator/libatibiosemu.o -LIBS += drivers/block/libblock.o -LIBS += drivers/dma/libdma.o -LIBS += drivers/fpga/libfpga.o -LIBS += drivers/gpio/libgpio.o -LIBS += drivers/hwmon/libhwmon.o -LIBS += drivers/i2c/libi2c.o -LIBS += drivers/input/libinput.o -LIBS += drivers/misc/libmisc.o -LIBS += drivers/mmc/libmmc.o -LIBS += drivers/mtd/libmtd.o -LIBS += drivers/mtd/nand/libnand.o -LIBS += drivers/mtd/onenand/libonenand.o -LIBS += drivers/mtd/ubi/libubi.o -LIBS += drivers/mtd/spi/libspi_flash.o -LIBS += drivers/net/libnet.o -LIBS += drivers/net/phy/libphy.o -LIBS += drivers/pci/libpci.o -LIBS += drivers/pcmcia/libpcmcia.o -LIBS += drivers/power/libpower.o -LIBS += drivers/spi/libspi.o +LIBS-y += net/libnet.o +LIBS-y += disk/libdisk.o +LIBS-y += drivers/bios_emulator/libatibiosemu.o +LIBS-y += drivers/block/libblock.o +LIBS-y += drivers/dma/libdma.o +LIBS-y += drivers/fpga/libfpga.o +LIBS-y += drivers/gpio/libgpio.o +LIBS-y += drivers/hwmon/libhwmon.o +LIBS-y += drivers/i2c/libi2c.o +LIBS-y += drivers/input/libinput.o +LIBS-y += drivers/misc/libmisc.o +LIBS-y += drivers/mmc/libmmc.o +LIBS-y += drivers/mtd/libmtd.o +LIBS-y += drivers/mtd/nand/libnand.o +LIBS-y += drivers/mtd/onenand/libonenand.o +LIBS-y += drivers/mtd/ubi/libubi.o +LIBS-y += drivers/mtd/spi/libspi_flash.o +LIBS-y += drivers/net/libnet.o +LIBS-y += drivers/net/phy/libphy.o +LIBS-y += drivers/pci/libpci.o +LIBS-y += drivers/pcmcia/libpcmcia.o +LIBS-y += drivers/power/libpower.o +LIBS-y += drivers/spi/libspi.o ifeq ($(CPU),mpc83xx) -LIBS += drivers/qe/libqe.o -LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o -LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o +LIBS-y += drivers/qe/libqe.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc85xx) -LIBS += drivers/qe/libqe.o -LIBS += drivers/net/fm/libfm.o -LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o -LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o +LIBS-y += drivers/qe/libqe.o +LIBS-y += drivers/net/fm/libfm.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif ifeq ($(CPU),mpc86xx) -LIBS += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o -LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o +LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif -LIBS += drivers/rtc/librtc.o -LIBS += drivers/serial/libserial.o +LIBS-y += drivers/rtc/librtc.o +LIBS-y += drivers/serial/libserial.o ifeq ($(CONFIG_GENERIC_LPC_TPM),y) -LIBS += drivers/tpm/libtpm.o -endif -LIBS += drivers/twserial/libtws.o -LIBS += drivers/usb/eth/libusb_eth.o -LIBS += drivers/usb/gadget/libusb_gadget.o -LIBS += drivers/usb/host/libusb_host.o -LIBS += drivers/usb/musb/libusb_musb.o -LIBS += drivers/usb/phy/libusb_phy.o -LIBS += drivers/usb/ulpi/libusb_ulpi.o -LIBS += drivers/video/libvideo.o -LIBS += drivers/watchdog/libwatchdog.o -LIBS += common/libcommon.o -LIBS += lib/libfdt/libfdt.o -LIBS += api/libapi.o -LIBS += post/libpost.o +LIBS-y += drivers/tpm/libtpm.o +endif +LIBS-y += drivers/twserial/libtws.o +LIBS-y += drivers/usb/eth/libusb_eth.o +LIBS-y += drivers/usb/gadget/libusb_gadget.o +LIBS-y += drivers/usb/host/libusb_host.o +LIBS-y += drivers/usb/musb/libusb_musb.o +LIBS-y += drivers/usb/phy/libusb_phy.o +LIBS-y += drivers/usb/ulpi/libusb_ulpi.o +LIBS-y += drivers/video/libvideo.o +LIBS-y += drivers/watchdog/libwatchdog.o +LIBS-y += common/libcommon.o +LIBS-y += lib/libfdt/libfdt.o +LIBS-y += api/libapi.o +LIBS-y += post/libpost.o
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) -LIBS += $(CPUDIR)/omap-common/libomap-common.o +LIBS-y += $(CPUDIR)/omap-common/libomap-common.o endif
ifeq ($(SOC),mx5) -LIBS += $(CPUDIR)/imx-common/libimx-common.o +LIBS-y += $(CPUDIR)/imx-common/libimx-common.o endif ifeq ($(SOC),mx6) -LIBS += $(CPUDIR)/imx-common/libimx-common.o +LIBS-y += $(CPUDIR)/imx-common/libimx-common.o endif
ifeq ($(SOC),s5pc1xx) -LIBS += $(CPUDIR)/s5p-common/libs5p-common.o +LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o endif ifeq ($(SOC),exynos) -LIBS += $(CPUDIR)/s5p-common/libs5p-common.o +LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o endif
-LIBS := $(addprefix $(obj),$(sort $(LIBS))) +LIBS := $(addprefix $(obj),$(sort $(LIBS-y))) .PHONY : $(LIBS)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
Acked-by: Mike Frysinger vapier@gentoo.org -mike
Dear Daniel Schwierzeck,
In message 1340901921-9868-3-git-send-email-daniel.schwierzeck@gmail.com you wrote:
Synchronize with ALL-y handling and code in spl/Makefile.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Makefile | 134 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Dear Wolfgang Denk,
Dear Daniel Schwierzeck,
In message 1340901921-9868-3-git-send-email-daniel.schwierzeck@gmail.com you
wrote:
Synchronize with ALL-y handling and code in spl/Makefile.
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Makefile | 134 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-)
Bah, looks like we have a breakage in here ... breaks whole range of spear300 machines and some tegra2s ... I'm investigating just now, but I think I can cite Wolfgang during his absence here (bah, I wasn't able to find any particularly beefy quotation, the following has to make do) :-)
"And all these build warnings - have you ever actully compiled that code? What's going on here??? - wd"
Applied, thanks.
Best regards,
Wolfgang Denk
Best regards, Marek Vasut
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com --- Makefile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile index 2bde73c..cf3c56d 100644 --- a/Makefile +++ b/Makefile @@ -225,15 +225,15 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
+HAVE_VENDOR_COMMON_LIB := $(shell [ -f board/$(VENDOR)/common/Makefile ] \ + && echo y || echo n) + LIBS-y += lib/libgeneric.o LIBS-y += lib/lzma/liblzma.o LIBS-y += lib/lzo/liblzo.o LIBS-y += lib/zlib/libz.o -ifeq ($(CONFIG_TIZEN),y) -LIBS-y += lib/tizen/libtizen.o -endif -LIBS-y += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ - "board/$(VENDOR)/common/lib$(VENDOR).o"; fi) +LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o +LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o LIBS-y += $(CPUDIR)/lib$(CPU).o ifdef SOC LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o @@ -241,9 +241,7 @@ endif ifeq ($(CPU),ixp) LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o endif -ifeq ($(CONFIG_OF_EMBED),y) -LIBS-y += dts/libdts.o -endif +LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \ @@ -288,9 +286,7 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/serial/libserial.o -ifeq ($(CONFIG_GENERIC_LPC_TPM),y) -LIBS-y += drivers/tpm/libtpm.o -endif +LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o LIBS-y += drivers/twserial/libtws.o LIBS-y += drivers/usb/eth/libusb_eth.o LIBS-y += drivers/usb/gadget/libusb_gadget.o
On Thursday 28 June 2012 12:45:21 Daniel Schwierzeck wrote:
--- a/Makefile +++ b/Makefile
+HAVE_VENDOR_COMMON_LIB := $(shell [ -f board/$(VENDOR)/common/Makefile ] \
&& echo y || echo n)
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) -mike
Hi Mike,
2012/7/19 Mike Frysinger vapier@gentoo.org:
On Thursday 28 June 2012 12:45:21 Daniel Schwierzeck wrote:
--- a/Makefile +++ b/Makefile
+HAVE_VENDOR_COMMON_LIB := $(shell [ -f board/$(VENDOR)/common/Makefile ] \
&& echo y || echo n)HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) -mike
yes, that's better. I'll also cook a patch for spl/Makefile that already has this piece of code.
Thanks, Daniel
From: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
--- Changes for v2: - optimized HAVE_VENDOR_COMMON_LIB macro as suggested by Mike - optimized HAVE_VENDOR_COMMON_LIB macro also in spl/Makefile --- Makefile | 17 ++++++----------- spl/Makefile | 3 +-- 2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile index 7d23954..a6c4ae4 100644 --- a/Makefile +++ b/Makefile @@ -225,15 +225,14 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
+HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile), y, n) + LIBS-y += lib/libgeneric.o LIBS-y += lib/lzma/liblzma.o LIBS-y += lib/lzo/liblzo.o LIBS-y += lib/zlib/libz.o -ifeq ($(CONFIG_TIZEN),y) -LIBS-y += lib/tizen/libtizen.o -endif -LIBS-y += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ - "board/$(VENDOR)/common/lib$(VENDOR).o"; fi) +LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o +LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o LIBS-y += $(CPUDIR)/lib$(CPU).o ifdef SOC LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o @@ -241,9 +240,7 @@ endif ifeq ($(CPU),ixp) LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o endif -ifeq ($(CONFIG_OF_EMBED),y) -LIBS-y += dts/libdts.o -endif +LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \ @@ -288,9 +285,7 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o endif LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/serial/libserial.o -ifeq ($(CONFIG_GENERIC_LPC_TPM),y) -LIBS-y += drivers/tpm/libtpm.o -endif +LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o LIBS-y += drivers/twserial/libtws.o LIBS-y += drivers/usb/eth/libusb_eth.o LIBS-y += drivers/usb/gadget/libusb_gadget.o diff --git a/spl/Makefile b/spl/Makefile index ea7d475..e9ecb9b 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -23,8 +23,7 @@ include $(TOPDIR)/config.mk # We want the final binaries in this directory obj := $(OBJTREE)/spl/
-HAVE_VENDOR_COMMON_LIB := $(shell [ -f $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ - && echo y || echo n) +HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile), y, n)
ifdef CONFIG_SPL_START_S_PATH START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH))
Dear daniel.schwierzeck@gmail.com,
In message 1342741198-9105-1-git-send-email-daniel.schwierzeck@gmail.com you wrote:
From: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Changes for v2:
- optimized HAVE_VENDOR_COMMON_LIB macro as suggested by Mike
- optimized HAVE_VENDOR_COMMON_LIB macro also in spl/Makefile
Makefile | 17 ++++++----------- spl/Makefile | 3 +-- 2 files changed, 7 insertions(+), 13 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
On Aug 10, 2012, at 4:17 PM, Wolfgang Denk wrote:
Dear daniel.schwierzeck@gmail.com,
In message 1342741198-9105-1-git-send-email-daniel.schwierzeck@gmail.com you wrote:
From: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Changes for v2:
- optimized HAVE_VENDOR_COMMON_LIB macro as suggested by Mike
- optimized HAVE_VENDOR_COMMON_LIB macro also in spl/Makefile
Makefile | 17 ++++++----------- spl/Makefile | 3 +-- 2 files changed, 7 insertions(+), 13 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
I spoke too soon, this patch is causing build issues on P4080DS_config:
[galak@right u-boot]$ make -j40 -s arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `ft_cpu_setup': /local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/fdt.c:614: undefined reference to `get_board_sys_clk' arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `get_sys_info': /local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/speed.c:77: undefined reference to `get_board_sys_clk' arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x344): undefined reference to `tlb_table' arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x348): undefined reference to `num_tlb_entries' arch/powerpc/lib/libpowerpc.o: In function `board_init_r': /local/home/galak/git/u-boot/arch/powerpc/lib/board.c:850: undefined reference to `mac_read_from_eeprom' common/libcommon.o:(.u_boot_cmd+0x370): undefined reference to `do_mac' drivers/misc/libmisc.o:(.got2+0x14): undefined reference to `law_table' drivers/misc/libmisc.o:(.got2+0x18): undefined reference to `num_law_entries' drivers/pci/libpci.o: In function `pci_init': /local/home/galak/git/u-boot/drivers/pci/pci.c:731: undefined reference to `pci_init_board' board/freescale/corenet_ds/libcorenet_ds.o: In function `ft_board_setup': /local/home/galak/git/u-boot/board/freescale/corenet_ds/corenet_ds.c:231: undefined reference to `pci_of_setup' board/freescale/corenet_ds/libcorenet_ds.o: In function `board_ft_fman_fixup_port': /local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:230: undefined reference to `fdt_set_phy_handle' /local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:238: undefined reference to `fdt_set_phy_handle' make: *** [u-boot] Error 1 [galak@right u-boot]$
- k
On Aug 14, 2012, at 8:52 AM, Kumar Gala wrote:
On Aug 10, 2012, at 4:17 PM, Wolfgang Denk wrote:
Dear daniel.schwierzeck@gmail.com,
In message 1342741198-9105-1-git-send-email-daniel.schwierzeck@gmail.com you wrote:
From: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Changes for v2:
- optimized HAVE_VENDOR_COMMON_LIB macro as suggested by Mike
- optimized HAVE_VENDOR_COMMON_LIB macro also in spl/Makefile
Makefile | 17 ++++++----------- spl/Makefile | 3 +-- 2 files changed, 7 insertions(+), 13 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
I spoke too soon, this patch is causing build issues on P4080DS_config:
[galak@right u-boot]$ make -j40 -s arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `ft_cpu_setup': /local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/fdt.c:614: undefined reference to `get_board_sys_clk' arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `get_sys_info': /local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/speed.c:77: undefined reference to `get_board_sys_clk' arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x344): undefined reference to `tlb_table' arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x348): undefined reference to `num_tlb_entries' arch/powerpc/lib/libpowerpc.o: In function `board_init_r': /local/home/galak/git/u-boot/arch/powerpc/lib/board.c:850: undefined reference to `mac_read_from_eeprom' common/libcommon.o:(.u_boot_cmd+0x370): undefined reference to `do_mac' drivers/misc/libmisc.o:(.got2+0x14): undefined reference to `law_table' drivers/misc/libmisc.o:(.got2+0x18): undefined reference to `num_law_entries' drivers/pci/libpci.o: In function `pci_init': /local/home/galak/git/u-boot/drivers/pci/pci.c:731: undefined reference to `pci_init_board' board/freescale/corenet_ds/libcorenet_ds.o: In function `ft_board_setup': /local/home/galak/git/u-boot/board/freescale/corenet_ds/corenet_ds.c:231: undefined reference to `pci_of_setup' board/freescale/corenet_ds/libcorenet_ds.o: In function `board_ft_fman_fixup_port': /local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:230: undefined reference to `fdt_set_phy_handle' /local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:238: undefined reference to `fdt_set_phy_handle' make: *** [u-boot] Error 1 [galak@right u-boot]$
- k
This is fixed by:
http://patchwork.ozlabs.org/patch/177235/
- k
Dear Daniel Schwierzeck,
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Makefile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile index 2bde73c..cf3c56d 100644 --- a/Makefile +++ b/Makefile @@ -225,15 +225,15 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
+HAVE_VENDOR_COMMON_LIB := $(shell [ -f board/$(VENDOR)/common/Makefile ] \
&& echo y || echo n)LIBS-y += lib/libgeneric.o LIBS-y += lib/lzma/liblzma.o LIBS-y += lib/lzo/liblzo.o LIBS-y += lib/zlib/libz.o -ifeq ($(CONFIG_TIZEN),y) -LIBS-y += lib/tizen/libtizen.o -endif -LIBS-y += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
- "board/$(VENDOR)/common/lib$(VENDOR).o"; fi)
+LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o +LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
It's apparently this change to HAVE_VENDOR_COMMON_LIB that breaks stuff :-(
LIBS-y += $(CPUDIR)/lib$(CPU).o ifdef SOC LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
[...]
Best regards, Marek Vasut
participants (7)
-
Daniel Schwierzeck -
Daniel Schwierzeck -
daniel.schwierzeck＠gmail.com
-
Kumar Gala -
Marek Vasut -
Mike Frysinger -
Wolfgang Denk