May 2008 - U-Boot

[U-Boot-Users] [PATCH] version_autogenerated.h: use printf rather than echo -n
by Mike Frysinger 04 May '08

04 May '08

Some systems are dumb and do not implement the -n flag to echo (like OS X). Convert the Makefile to use printf as this should work everywhere. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Makefile | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ac0a17f..45d43aa 100644 --- a/Makefile +++ b/Makefile @@ -352,11 +352,9 @@ $(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin $(obj)include/autoconf.mk cat $(obj)onenand_ipl/onenand-ipl-4k.bin $(obj)u-boot.bin > $(obj)u-boot-flexonenand.bin $(VERSION_FILE): - @( echo -n "#define U_BOOT_VERSION \"U-Boot " ; \ - echo -n "$(U_BOOT_VERSION)" ; \ - echo -n $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion \ - $(TOPDIR)) ; \ - echo "\"" ) > $@.tmp + @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \ + $(shell $(CONFIG_SHELL) $(TOPDIR)/tools/setlocalversion $(TOPDIR)) \ + ) > $@.tmp @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ gdbtools: -- 1.5.5.1

2 3

[U-Boot-Users] [PATCH] SBC8548: fix address mask to allow 64M flash
by Jeremy McNicoll 04 May '08

04 May '08

Fix incorrect mask to enable all 64MB of onboard flash. Previously U-Boot incorrectly mapped only 8MB of flash, this patch correctly maps all the available flash. Signed-off-by: Jeremy McNicoll <jeremy.mcnicoll(a)windriver.com> --- include/configs/sbc8548.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 516203a..1c6225d 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -147,7 +147,7 @@ * 1111 1111 1000 0000 0110 1110 0110 0101 = ff806e65 OR0 * * OR6: - * Addr Mask = 64M = OR6[0:16] = 1111 1100 0000 0000 0 + * Addr Mask = 64M = OR6[0:16] = 1111 1000 0000 0000 0 * XAM = OR6[17:18] = 11 * CSNT = OR6[20] = 1 * ACS = half cycle delay = OR6[21:22] = 11 @@ -156,7 +156,7 @@ * EAD = use external address latch delay = OR6[31] = 1 * * 0 4 8 12 16 20 24 28 - * 1111 1100 0000 0000 0110 1110 0110 0101 = fc006e65 OR6 + * 1111 1000 0000 0000 0110 1110 0110 0101 = f8006e65 OR6 */ #define CFG_BOOT_BLOCK 0xff800000 /* start of 8MB Flash */ @@ -166,7 +166,7 @@ #define CFG_BR6_PRELIM 0xfb801801 #define CFG_OR0_PRELIM 0xff806e65 -#define CFG_OR6_PRELIM 0xfc006e65 +#define CFG_OR6_PRELIM 0xf8006e65 #define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE} #define CFG_MAX_FLASH_BANKS 1 /* number of banks */ -- 1.5.3.7

2 1

[U-Boot-Users] [PATCH] qemu_mips: add README
by Jean-Christophe PLAGNIOL-VILLARD 04 May '08

04 May '08

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- doc/README.qemu_mips | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 doc/README.qemu_mips diff --git a/doc/README.qemu_mips b/doc/README.qemu_mips new file mode 100644 index 0000000..476c5e6 --- /dev/null +++ b/doc/README.qemu_mips @@ -0,0 +1,18 @@ + +Notes for the Qemu MIPS port + +Example usage: + +# ln -s u-boot.bin mips_bios.bin +start it: +qemu-system-mips -L . /dev/null -nographic + +or + +if you use a qemu version after commit 4224 + +create image: +# dd of=flash bs=1k count=4k if=/dev/zero +# dd of=flash bs=1k conv=notrunc if=u-boot.bin +start it: +# qemu-system-mips -pflash flash -monitor null -nographic -- 1.5.4.5

2 1

[U-Boot-Users] [GIT PULL] MIPS updates
by Shinya Kuribayashi 04 May '08

04 May '08

Dear Wolfgang, please pull MIPS updates. 2 patches are there. One fixes a build failure caused by absence of dcache_enable(). The other is for a better handling of gas minor version (this isn't a kind of bug fix, but I'd like to push this for 1.3.3 release. Ok?). Each patch has not been posted to u-boot-users yet, so they will follow this mail. Please review (and apply). thanks, Shinya --- The following changes since commit 50f93d30dae3c5d888aa244d964ccd77be9b1c0c: Wolfgang Denk (1): Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master are available in the git repository at: git://git.denx.de/u-boot-mips.git master Shinya Kuribayashi (2): [MIPS] cpu/mips/cache.S: Add dcache_enable [MIPS] cpu/mips/config.mk: Fix GNU assembler minor version picker cpu/mips/cache.S | 16 ++++++++++++++++ cpu/mips/config.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-)

3 4

[U-Boot-Users] [PATCH] Fix misspelled comment
by Marcel Ziswiler 04 May '08

04 May '08

Signed-off-by: Marcel Ziswiler <marcel(a)ziswiler.com> --- include/asm-arm/io.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index c33b9e8..f4ae307 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h @@ -123,7 +123,7 @@ extern void __raw_readsl(unsigned int addr, void *data, int longlen); * only. Their primary purpose is to access PCI and ISA peripherals. * * Note that for a big endian machine, this implies that the following - * big endian mode connectivity is in place, as described by numerious + * big endian mode connectivity is in place, as described by numerous * ARM documents: * * PCI: D0-D7 D8-D15 D16-D23 D24-D31 -- 1.5.4.1

2 1

[U-Boot-Users] [PATCH] mkimage: make mmap() checks consistent
by Mike Frysinger 03 May '08

03 May '08

The mmap() related code is full of inconsistent casts/constants when it comes to error checking, and may break when building on some systems (like ones that do not implicitly define the caddr_t type). Let's just avoid the whole mess by writing the code nice and clean in the first place. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tools/mkimage.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/tools/mkimage.c b/tools/mkimage.c index ea7a826..967fe9a 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -28,7 +28,7 @@ extern int errno; #ifndef MAP_FAILED -#define MAP_FAILED (-1) +#define MAP_FAILED (void *)(-1) #endif extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len); @@ -218,9 +218,8 @@ NXTARG: ; exit (EXIT_FAILURE); } - ptr = (unsigned char *)mmap(0, sbuf.st_size, - PROT_READ, MAP_SHARED, ifd, 0); - if ((caddr_t)ptr == (caddr_t)-1) { + ptr = mmap(0, sbuf.st_size, PROT_READ, MAP_SHARED, ifd, 0); + if (ptr == MAP_FAILED) { fprintf (stderr, "%s: Can't read %s: %s\n", cmdname, imagefile, strerror(errno)); exit (EXIT_FAILURE); @@ -330,9 +329,8 @@ NXTARG: ; exit (EXIT_FAILURE); } - ptr = (unsigned char *)mmap(0, sbuf.st_size, - PROT_READ|PROT_WRITE, MAP_SHARED, ifd, 0); - if (ptr == (unsigned char *)MAP_FAILED) { + ptr = mmap(0, sbuf.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, ifd, 0); + if (ptr == MAP_FAILED) { fprintf (stderr, "%s: Can't map %s: %s\n", cmdname, imagefile, strerror(errno)); exit (EXIT_FAILURE); @@ -410,9 +408,8 @@ copy_file (int ifd, const char *datafile, int pad) exit (EXIT_FAILURE); } - ptr = (unsigned char *)mmap(0, sbuf.st_size, - PROT_READ, MAP_SHARED, dfd, 0); - if (ptr == (unsigned char *)MAP_FAILED) { + ptr = mmap(0, sbuf.st_size, PROT_READ, MAP_SHARED, dfd, 0); + if (ptr == MAP_FAILED) { fprintf (stderr, "%s: Can't read %s: %s\n", cmdname, datafile, strerror(errno)); exit (EXIT_FAILURE); @@ -594,9 +591,8 @@ static void fit_handle_file (void) exit (EXIT_FAILURE); } - ptr = (unsigned char *)mmap (0, sbuf.st_size, - PROT_READ|PROT_WRITE, MAP_SHARED, tfd, 0); - if ((caddr_t)ptr == (caddr_t)-1) { + ptr = mmap (0, sbuf.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, tfd, 0); + if (ptr == MAP_FAILED) { fprintf (stderr, "%s: Can't read %s: %s\n", cmdname, tmpfile, strerror(errno)); unlink (tmpfile); -- 1.5.5

2 1

[U-Boot-Users] [PATCH] Fix defined but not used build warning
by Marcel Ziswiler 03 May '08

03 May '08

- warning: ‘srom’ defined but not used Signed-off-by: Marcel Ziswiler <marcel(a)ziswiler.com> --- board/trizepsiv/eeprom.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c index 3d3bc00..7a2b905 100644 --- a/board/trizepsiv/eeprom.c +++ b/board/trizepsiv/eeprom.c @@ -24,7 +24,6 @@ #include <common.h> #include <command.h> -static unsigned char srom[128]; extern u16 read_srom_word(int); extern void write_srom_word(int offset, u16 val); -- 1.5.4.1

2 1

[U-Boot-Users] [PATCH] Fix various redefinition build warnings
by Marcel Ziswiler 03 May '08

03 May '08

- warning: "ICMR" redefined - warning: "RCSR" redefined - warning: "OSMR3" redefined - warning: "OSCR" redefined - warning: "OWER" redefined - warning: "OIER" redefined - warning: "CCCR" redefined Signed-off-by: Marcel Ziswiler <marcel(a)ziswiler.com> --- cpu/pxa/start.S | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S index 31f408d..a460f30 100644 --- a/cpu/pxa/start.S +++ b/cpu/pxa/start.S @@ -166,17 +166,17 @@ _start_armboot: .word start_armboot /* */ /****************************************************************************/ /* mk@tbd: Fix this! */ -#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS) +#if defined(CONFIG_PXA250) || defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) #undef ICMR #undef OSMR3 #undef OSCR #undef OWER #undef OIER -#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */ -#ifdef CONFIG_PXA250 +#endif /* CONFIG_PXA250 || CONFIG_PXA27X || CONFIG_CPU_MONAHANS */ +#if defined(CONFIG_PXA250) || defined(CONFIG_PXA27X) #undef RCSR #undef CCCR -#endif /* CONFIG_PXA250 */ +#endif /* CONFIG_PXA250 || CONFIG_PXA27X */ /* Interrupt-Controller base address */ IC_BASE: .word 0x40d00000 -- 1.5.4.1

2 1

[U-Boot-Users] [PATCH] config.mk: use correct (cross) compiler
by Wolfgang Denk 03 May '08

03 May '08

Some config.mk files reference $(CC) to test for specific tool chain features, so make sure $(CC) gets set before including any such config files. This patch replaces commit b7166e05a5 ("ColdFire: Get information from the correct GCC"). Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- config.mk | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/config.mk b/config.mk index 22d3398..62fc1d5 100644 --- a/config.mk +++ b/config.mk @@ -69,27 +69,6 @@ PLATFORM_CPPFLAGS+= -D__ARM__ endif endif -# Load generated board configuration -sinclude $(OBJTREE)/include/autoconf.mk - -ifdef ARCH -sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules -endif -ifdef CPU -sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules -endif -ifdef SOC -sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules -endif -ifdef VENDOR -BOARDDIR = $(VENDOR)/$(BOARD) -else -BOARDDIR = $(BOARD) -endif -ifdef BOARD -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules -endif - ######################################################################### CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -127,6 +106,31 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump RANLIB = $(CROSS_COMPILE)RANLIB +######################################################################### + +# Load generated board configuration +sinclude $(OBJTREE)/include/autoconf.mk + +ifdef ARCH +sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules +endif +ifdef CPU +sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules +endif +ifdef SOC +sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules +endif +ifdef VENDOR +BOARDDIR = $(VENDOR)/$(BOARD) +else +BOARDDIR = $(BOARD) +endif +ifdef BOARD +sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules +endif + +######################################################################### + ifneq (,$(findstring s,$(MAKEFLAGS))) ARFLAGS = cr else -- 1.5.4.2

1 0

[U-Boot-Users] 1.3.3-rc2 - release status
by Wolfgang Denk 03 May '08

03 May '08

Hello, U-Boot v1.3.3-rc2 has just been released. PowerPC seems to be in a pretty good state now; other architectures still need a lot of testing / fixing. For example, on ARM we see the following conflicts: Configuring for kb9202 board... start.S: Assembler messages: start.S:205: Error: invalid constant -- `sub r0,r0,#(0x0200+128*1024)' start.S:378: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:379: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' start.S:384: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:385: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' start.S:390: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:391: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' start.S:396: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:397: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' start.S:402: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:403: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' start.S:427: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:428: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' start.S:433: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))' start.S:434: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))' make[1]: *** [start.o] Error 1 Configuring for netstar board... arm-linux-ld: cannot find -lgeneric make[1]: *** [eeprom.srec] Error 1 Configuring for voiceblue board... arm-linux-ld: cannot find -lgeneric make[1]: *** [eeprom.srec] Error 1 Configuring for apollon board... onenand_base.c:25: error: static declaration of 'memcpy' follows non-static declaration /home/wd/git/u-boot/master/include/linux/string.h:70: error: previous declaration of 'memcpy' was here make[1]: *** [onenand_base.o] Error 1 Configuring for adsvix board... start.S:183:1: warning: "ICMR" redefined In file included from start.S:33: /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition start.S:187:1: warning: "RCSR" redefined /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:1602:1: warning: this is the location of the previous definition start.S:191:1: warning: "OSMR3" redefined /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:869:1: warning: this is the location of the previous definition start.S:192:1: warning: "OSCR" redefined /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:870:1: warning: this is the location of the previous definition start.S:193:1: warning: "OWER" redefined /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:872:1: warning: this is the location of the previous definition start.S:194:1: warning: "OIER" redefined /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:873:1: warning: this is the location of the previous definition start.S:207:1: warning: "CCCR" redefined /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:1770:1: warning: this is the location of the previous definition pcmcia.c:39:2: warning: #warning "Board will only supply 5V, wait for next HW spin for selectable power" pxa_pcmcia.c: In function 'pcmcia_on': pxa_pcmcia.c:39: warning: operation on 'i' may be undefined cmd_ide.c: In function '__ide_outb': cmd_ide.c:828: warning: implicit declaration of function 'outb' cmd_ide.c: In function '__ide_inb': cmd_ide.c:837: warning: implicit declaration of function 'inb' common/libcommon.a(cmd_ide.o): In function `__ide_outb': /home/wd/git/u-boot/master/common/cmd_ide.c:828: undefined reference to `outb' common/libcommon.a(cmd_ide.o): In function `__ide_inb': /home/wd/git/u-boot/master/common/cmd_ide.c:837: undefined reference to `inb' make: *** [u-boot] Error 1 Configuring for actux4 board... actux4.c: In function 'board_init': actux4.c:83: warning: left shift count >= width of type actux4.c:83: warning: left shift count >= width of type Configuring for davinci_schmoogie board... env_nand.c: In function 'saveenv': env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type env_nand.c: In function 'env_relocate_spec': env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type Board maintainers / custodians - please help! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de If programming was easy, they wouldn't need something as complicated as a human being to do it, now would they? - L. Wall & R. L. Schwartz, _Programming Perl_

3 11