From: Woodruff, Richard <r-woodruff2@ti.com>
Date: Fri, 29 Feb 2008 23:34:35 +0000 (-0600)
Subject: Fix alignment error on ARM for modules
X-Git-Tag: v1.3.2-rc3~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=118978c8eb43803e2794233922df4249fa278b83;p=oweals%2Fu-boot.git

Fix alignment error on ARM for modules

Fix alignment fault on ARM when running modules.  With out an explicit
linker file gcc4.2.1 will half word align __bss_start's value.  The word
dereference will crash hello_world.

signed-off-by Richard Woodruff <r-woodruff2@ti.com>
---

diff --git a/examples/Makefile b/examples/Makefile
index d63fa70323..60a6f5ea56 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -30,8 +30,12 @@ LOAD_ADDR = 0x40000
 endif
 
 ifeq ($(ARCH),arm)
+ifeq ($(BOARD),omap2420h4)
+LOAD_ADDR = 0x80300000
+else
 LOAD_ADDR = 0xc100000
 endif
+endif
 
 ifeq ($(ARCH),mips)
 LOAD_ADDR = 0x80200000 -T mips.lds
diff --git a/examples/stubs.c b/examples/stubs.c
index 9b3cadde33..b9dbcf9065 100644
--- a/examples/stubs.c
+++ b/examples/stubs.c
@@ -190,10 +190,10 @@ extern unsigned long __bss_start, _end;
 
 void app_startup(char **argv)
 {
-	unsigned long * cp = &__bss_start;
+	unsigned char * cp = (unsigned char *) &__bss_start;
 
 	/* Zero out BSS */
-	while (cp < &_end) {
+	while (cp < (unsigned char *)&_end) {
 		*cp++ = 0;
 	}