diff options
| author | Wolfgang Denk <[email protected]> | 2006-06-14 17:52:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2006-06-14 17:52:00 +0200 |
| commit | 007d67da94db86989c3d0ad0a9728391b7eed02b (patch) | |
| tree | b24a2708448b83ef0b372c1e3502b7908f54d283 /examples | |
| parent | 16c8d5e76ae0f78f39a60608574adfe0feb9cc70 (diff) | |
| parent | df02bd1b3f2eecca04bfecb62eae7c2ff698506a (diff) | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile | 4 | ||||
| -rw-r--r-- | examples/stubs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/Makefile b/examples/Makefile index b198048973e..a342d75062a 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -42,7 +42,7 @@ LOAD_ADDR = 0x00800000 -L $(gcclibdir)/m32 -T nios.lds endif ifeq ($(ARCH),nios2) -LOAD_ADDR = 0x00800000 -L $(gcclibdir) -T nios2.lds +LOAD_ADDR = 0x02000000 -L $(gcclibdir) -T nios2.lds endif ifeq ($(ARCH),m68k) @@ -122,7 +122,7 @@ clibdir := $(shell dirname `$(CC) $(CFLAGS) -print-file-name=libc.a`) CPPFLAGS += -I.. -all: .depend $(OBJS) $(LIB) #$(SREC) $(BIN) +all: .depend $(OBJS) $(LIB) $(SREC) $(BIN) ######################################################################### $(LIB): .depend $(LIBOBJS) diff --git a/examples/stubs.c b/examples/stubs.c index 250a9af6e56..1caa5757479 100644 --- a/examples/stubs.c +++ b/examples/stubs.c @@ -92,7 +92,7 @@ gd_t *global_data; #x ":\n" \ " movhi r8, %%hi(%0)\n" \ " ori r8, r0, %%lo(%0)\n" \ -" add r8, r0, r15\n" \ +" add r8, r8, r15\n" \ " ldw r8, 0(r8)\n" \ " ldw r8, %1(r8)\n" \ " jmp r8\n" \ |