summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorScott McNutt <smcnutt@psyent.com>2006-06-08 11:59:57 -0400
committerScott McNutt <smcnutt@psyent.com>2006-06-08 11:59:57 -0400
commitc2ced000f4f18361feb36ea257fabbb46913e1d4 (patch)
tree6ba42fa4c9b37b96491846e8e807f351bc5202e1 /examples
parente461a24113c66747510b07930a83b0d84171a559 (diff)
downloadu-boot-c2ced000f4f18361feb36ea257fabbb46913e1d4.tar.gz
u-boot-c2ced000f4f18361feb36ea257fabbb46913e1d4.tar.bz2
u-boot-c2ced000f4f18361feb36ea257fabbb46913e1d4.zip
Nios II - Fix I/O Macros and mini-app stubs
-Fix asm/io.h macros -Eliminate use of CACHE_BYPASS in cpu code -Eliminate assembler warnings -Fix mini-app stubs and force no small data Patch by Scott McNutt, 08 Jun 2006
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile2
-rw-r--r--examples/stubs.c2
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" \