diff options
author | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
commit | 7c6237b3e2f2ee0098897da39b79aff4642b8946 (patch) | |
tree | d768b7851bb688f543da0a3ed50c927a2bde2804 /board/sh7763rdp | |
parent | dd1c5523d6f44e842e69f2fcb50788c6060eab86 (diff) | |
parent | c956717ab25c962ef49d49064dfc73f4edcba1fb (diff) | |
download | u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.zip u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.gz u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/sh7763rdp')
-rw-r--r-- | board/sh7763rdp/Makefile | 16 | ||||
-rw-r--r-- | board/sh7763rdp/lowlevel_init.S | 1 | ||||
-rw-r--r-- | board/sh7763rdp/u-boot.lds | 1 |
3 files changed, 10 insertions, 8 deletions
diff --git a/board/sh7763rdp/Makefile b/board/sh7763rdp/Makefile index 9e63ea7..8a04477 100644 --- a/board/sh7763rdp/Makefile +++ b/board/sh7763rdp/Makefile @@ -23,25 +23,29 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a OBJS := sh7763rdp.o SOBJS := lowlevel_init.o +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) distclean: clean - rm -f $(LIB) core *.bak .depend + rm -f $(LIB) core *.bak $(obj).depend ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk --include .depend +sinclude $(obj).depend ######################################################################### diff --git a/board/sh7763rdp/lowlevel_init.S b/board/sh7763rdp/lowlevel_init.S index 1942892..2a44eee 100644 --- a/board/sh7763rdp/lowlevel_init.S +++ b/board/sh7763rdp/lowlevel_init.S @@ -348,4 +348,3 @@ SR_MASK_D: .long 0xEFFFFF0F WDTST_D: .long 0x5A000FFF WDTCSR_D: .long 0xA5000000 WDTBST_D: .long 0x55000000 - diff --git a/board/sh7763rdp/u-boot.lds b/board/sh7763rdp/u-boot.lds index 8f8229b..c07f0d8 100644 --- a/board/sh7763rdp/u-boot.lds +++ b/board/sh7763rdp/u-boot.lds @@ -103,4 +103,3 @@ SECTIONS PROVIDE (_end = .); } - |