diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-10 01:36:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-10 01:36:27 +0200 |
| commit | 9d4d3e3833ca7f4dada190ddcb3fea1da9bb9b5b (patch) | |
| tree | 2e48d77afa769a4515101e4ce4ef2c6ba48cbeff /examples | |
| parent | 5d7022b0418b3aab977ac51dbfd179c296ae442e (diff) | |
| parent | 9cc833783206efd25b4655aa451ce81e5cc28fc2 (diff) | |
Merge with http://www.psyent.com/git/uboot (NIOS2 - Scott McNutt)
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile | 2 | ||||
| -rw-r--r-- | examples/stubs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/Makefile b/examples/Makefile index fee26741d0..a342d75062 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) diff --git a/examples/stubs.c b/examples/stubs.c index 250a9af6e5..1caa575747 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" \ |