diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:26:52 +0100 |
| commit | 9e04a8138892d64848dc6e8e74213086d9190d9a (patch) | |
| tree | 1740a361891d2390631ec053f1bc42e524913b78 /board/sbc8641d/Makefile | |
| parent | 32c70d3420739930165271d9a1b04572adf799fd (diff) | |
| parent | 746c4b9490495dc4381dbcc49f40078d423e0a48 (diff) | |
| download | u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.zip u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.gz u-boot-imx-9e04a8138892d64848dc6e8e74213086d9190d9a.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Conflicts:
common/cmd_reginfo.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/sbc8641d/Makefile')
| -rw-r--r-- | board/sbc8641d/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/sbc8641d/Makefile b/board/sbc8641d/Makefile index a90b725..115df05 100644 --- a/board/sbc8641d/Makefile +++ b/board/sbc8641d/Makefile @@ -25,8 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o -SOBJS := init.o +COBJS := $(BOARD).o law.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) |