diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-25 11:32:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-25 11:32:01 +0200 |
| commit | 4b7a6dd89633d60dc4b58476d5ce48247f82a3ca (patch) | |
| tree | d3cfeccec77867d855289809d6a472617d16c0cc /Makefile | |
| parent | 926662762e5d280f6a9caed8dd9f49be2ebcaf2f (diff) | |
| parent | a6e6fc610e39dec41b79680413d4ed38145bd3c8 (diff) | |
| download | blackbird-obmc-uboot-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.tar.gz blackbird-obmc-uboot-4b7a6dd89633d60dc4b58476d5ce48247f82a3ca.zip | |
Merge branch 'master' of /home/wd/git/u-boot/lwmon5
Conflicts:
common/cmd_bootm.c
common/cmd_log.c
include/common.h
post/board/lwmon5/Makefile
post/board/lwmon5/dsp.c
post/board/lwmon5/dspic.c
post/board/lwmon5/fpga.c
post/board/lwmon5/gdc.c
post/board/lwmon5/sysmon.c
post/board/lwmon5/watchdog.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -240,18 +240,10 @@ LIBS += drivers/rtc/librtc.a LIBS += drivers/serial/libserial.a LIBS += drivers/usb/libusb.a LIBS += drivers/video/libvideo.a -LIBS += post/libpost.a post/drivers/libpostdrivers.a -LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \ - "post/lib_$(ARCH)/libpost$(ARCH).a"; fi) -LIBS += $(shell if [ -d post/lib_$(ARCH)/fpu ]; then echo \ - "post/lib_$(ARCH)/fpu/libpost$(ARCH)fpu.a"; fi) -LIBS += $(shell if [ -d post/cpu/$(CPU) ]; then echo \ - "post/cpu/$(CPU)/libpost$(CPU).a"; fi) -LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \ - "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi) LIBS += common/libcommon.a LIBS += libfdt/libfdt.a LIBS += api/libapi.a +LIBS += post/libpost.a LIBS := $(addprefix $(obj),$(LIBS)) .PHONY : $(LIBS) $(VERSION_FILE) |
