Merge branch 'master' of git://www.denx.de/git/u-boot into new-image

This commit is contained in:
Marian Balakowicz
2008-03-12 12:23:02 +01:00
183 changed files with 1969 additions and 779 deletions

View File

@@ -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)

View File

@@ -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;
}