Commit 8b5a0264 authored by Daniel Schwierzeck's avatar Daniel Schwierzeck Committed by Wolfgang Denk

Makefile: cosmetic: optimize usage of LIBS-y

Signed-off-by: default avatarDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
parent f52d7b35
...@@ -225,15 +225,14 @@ endif ...@@ -225,15 +225,14 @@ endif
OBJS := $(addprefix $(obj),$(OBJS)) OBJS := $(addprefix $(obj),$(OBJS))
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile), y, n)
LIBS-y += lib/libgeneric.o LIBS-y += lib/libgeneric.o
LIBS-y += lib/lzma/liblzma.o LIBS-y += lib/lzma/liblzma.o
LIBS-y += lib/lzo/liblzo.o LIBS-y += lib/lzo/liblzo.o
LIBS-y += lib/zlib/libz.o LIBS-y += lib/zlib/libz.o
ifeq ($(CONFIG_TIZEN),y) LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o
LIBS-y += lib/tizen/libtizen.o LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
endif
LIBS-y += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
"board/$(VENDOR)/common/lib$(VENDOR).o"; fi)
LIBS-y += $(CPUDIR)/lib$(CPU).o LIBS-y += $(CPUDIR)/lib$(CPU).o
ifdef SOC ifdef SOC
LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
...@@ -241,9 +240,7 @@ endif ...@@ -241,9 +240,7 @@ endif
ifeq ($(CPU),ixp) ifeq ($(CPU),ixp)
LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o
endif endif
ifeq ($(CONFIG_OF_EMBED),y) LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
LIBS-y += dts/libdts.o
endif
LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).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 \ 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/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \
...@@ -288,9 +285,7 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o ...@@ -288,9 +285,7 @@ LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
endif endif
LIBS-y += drivers/rtc/librtc.o LIBS-y += drivers/rtc/librtc.o
LIBS-y += drivers/serial/libserial.o LIBS-y += drivers/serial/libserial.o
ifeq ($(CONFIG_GENERIC_LPC_TPM),y) LIBS-$(CONFIG_GENERIC_LPC_TPM) += drivers/tpm/libtpm.o
LIBS-y += drivers/tpm/libtpm.o
endif
LIBS-y += drivers/twserial/libtws.o LIBS-y += drivers/twserial/libtws.o
LIBS-y += drivers/usb/eth/libusb_eth.o LIBS-y += drivers/usb/eth/libusb_eth.o
LIBS-y += drivers/usb/gadget/libusb_gadget.o LIBS-y += drivers/usb/gadget/libusb_gadget.o
......
...@@ -23,8 +23,7 @@ include $(TOPDIR)/config.mk ...@@ -23,8 +23,7 @@ include $(TOPDIR)/config.mk
# We want the final binaries in this directory # We want the final binaries in this directory
obj := $(OBJTREE)/spl/ obj := $(OBJTREE)/spl/
HAVE_VENDOR_COMMON_LIB := $(shell [ -f $(SRCTREE)/board/$(VENDOR)/common/Makefile ] \ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile), y, n)
&& echo y || echo n)
ifdef CONFIG_SPL_START_S_PATH ifdef CONFIG_SPL_START_S_PATH
START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH)) START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment