diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 12:23:02 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 12:23:02 +0100 |
| commit | 7e492d8258182e31c988bbf9917d4a3d41949d56 (patch) | |
| tree | e9c9db79d797cf487107c019537c6bb00b854c6c /examples | |
| parent | afe45c87e3c5d77bad76b1a57dccd20764d45b5d (diff) | |
| parent | 30f1806f60978d707b0cff2d7bf89d141fc24290 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile | 10 | ||||
| -rw-r--r-- | examples/stubs.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/examples/Makefile b/examples/Makefile index d63fa7032..c5d629b68 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 @@ -73,9 +77,9 @@ SREC = hello_world.srec BIN = hello_world.bin ifeq ($(CPU),mpc8xx) -ELF = test_burst -SREC = test_burst.srec -BIN = test_burst.bin +ELF += test_burst +SREC += test_burst.srec +BIN += test_burst.bin endif ifeq ($(ARCH),i386) diff --git a/examples/stubs.c b/examples/stubs.c index 9b3cadde3..b9dbcf906 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; } |