X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=examples%2FMakefile;h=2f8c4c40352cb614cd6c186783ac6b371b9e63e2;hb=82f4c6ac84b3fe81359f863a476196def9fb35ab;hp=7a7739f6d86a54209995fac0ab66e5cdb4b2fe8e;hpb=4e5ca3eb670460cd5ad9b07fa4aafc0dee6178be;p=u-boot

diff --git a/examples/Makefile b/examples/Makefile
index 7a7739f6d8..2f8c4c4035 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000
+# (C) Copyright 2000-2004
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -38,44 +38,57 @@ LOAD_ADDR = 0x80200000 -T mips.lds
 endif
 
 ifeq ($(ARCH),nios)
-LOAD_ADDR = 0x01000000 -L $(gcclibdir)/m32 -T nios.lds
+LOAD_ADDR = 0x00800000 -L $(gcclibdir)/m32 -T nios.lds
+endif
+
+ifeq ($(ARCH),nios2)
+LOAD_ADDR = 0x00800000 -L $(gcclibdir) -T nios2.lds
+endif
+
+ifeq ($(ARCH),m68k)
+LOAD_ADDR = 0x20000  -L $(clibdir)
+endif
+
+ifeq ($(ARCH),microblaze)
+LOAD_ADDR = 0x80F00000
 endif
 
 include $(TOPDIR)/config.mk
 
 SREC	= hello_world.srec
-BIN	= hello_world.bin
+BIN	= hello_world.bin hello_world
+
+ifeq ($(CPU),mpc8xx)
+SREC	= test_burst.srec
+BIN	= test_burst.bin test_burst
+endif
 
 ifeq ($(ARCH),i386)
 SREC   += 82559_eeprom.srec
-BIN    += 82559_eeprom.bin
+BIN    += 82559_eeprom.bin 82559_eeprom
 endif
 
 ifeq ($(ARCH),ppc)
 SREC   += sched.srec
-BIN    += sched.bin
-endif
-
-ifeq ($(ARCH),m68k)
-SREC =
-BIN =
+BIN    += sched.bin sched
 endif
 
 # The following example is pretty 8xx specific...
 ifeq ($(CPU),mpc8xx)
 SREC   += timer.srec
-BIN    += timer.bin
+BIN    += timer.bin timer
 endif
 
 # The following example is 8260 specific...
 ifeq ($(CPU),mpc8260)
 SREC   += mem_to_mem_idma2intr.srec
-BIN    += mem_to_mem_idma2intr.bin
+BIN    += mem_to_mem_idma2intr.bin mem_to_mem_idma2intr
 endif
 
 # Utility for resetting i82559 EEPROM
 ifeq ($(BOARD),oxc)
 SREC   += eepro100_eeprom.srec
+BIN    += eepro100_eeprom.bin eepro100_eeprom
 endif
 
 ifeq ($(BIG_ENDIAN),y)
@@ -89,27 +102,32 @@ LIBAOBJS=
 ifeq ($(ARCH),ppc)
 LIBAOBJS+= $(ARCH)_longjmp.o $(ARCH)_setjmp.o
 endif
+ifeq ($(CPU),mpc8xx)
+LIBAOBJS+= test_burst_lib.o
+endif
 LIBCOBJS= stubs.o
 LIBOBJS	= $(LIBAOBJS) $(LIBCOBJS)
 
 gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
+clibdir := $(shell dirname `$(CC) $(CFLAGS) -print-file-name=libc.a`)
 
 CPPFLAGS += -I..
 
-all:	.depend $(LIB) $(SREC) $(BIN)
+all:	.depend $(OBJS) $(LIB) $(SREC) $(BIN)
 
 #########################################################################
 $(LIB): .depend $(LIBOBJS)
 	$(AR) crv $@ $(LIBOBJS)
 
-%.srec:	%.o $(LIB)
+%:	%.o $(LIB)
 	$(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \
-		-o $(<:.o=) -e $(<:.o=) $< $(LIB) \
+		-o $@ -e $(<:.o=) $< $(LIB) \
 		-L$(gcclibdir) -lgcc
-	$(OBJCOPY) -O srec $(<:.o=) $@
+%.srec:	%
+	$(OBJCOPY) -O srec $< $@ 2>/dev/null
 
-%.bin:	%.srec
-	$(OBJCOPY) -O binary $(<:.srec=) $@ 2>/dev/null
+%.bin:	%
+	$(OBJCOPY) -O binary $< $@ 2>/dev/null
 
 #########################################################################