December 2008 - U-Boot

[U-Boot] [PATCH] board/trab/memory.c: Fix compile problems.
by Wolfgang Denk 16 Dec '08

16 Dec '08

Apply changes from commit 44b4dbed to board/trab/memory.c, too. Actually we'd need a major cleanup here - as it turns out, board/trab/memory.c is more or less a verbatim copy of post/drivers/memory.c ... but then, trab is EOL anyway,r so this is not worth the effort. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/trab/memory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/trab/memory.c b/board/trab/memory.c index 8fb3d2c..895b68e 100644 --- a/board/trab/memory.c +++ b/board/trab/memory.c @@ -184,7 +184,7 @@ * * For other processors, let the compiler generate the best code it can. */ -static void move64(unsigned long long *src, unsigned long long *dest) +static void move64(const unsigned long long *src, unsigned long long *dest) { #if defined(CONFIG_MPC8260) || defined(CONFIG_MPC824X) asm ("lfd 0, 0(3)\n\t" /* fpr0 = *scr */ @@ -231,12 +231,12 @@ static int memory_post_dataline(unsigned long long * pmem) int ret = 0; for ( i = 0; i < num_patterns; i++) { - move64((unsigned long long *)&(pattern[i]), pmem++); + move64(&(pattern[i]), pmem++); /* * Put a different pattern on the data lines: otherwise they * may float long enough to read back what we wrote. */ - move64((unsigned long long *)&otherpattern, pmem--); + move64(&otherpattern, pmem--); move64(pmem, &temp64); #ifdef INJECT_DATA_ERRORS -- 1.6.0.4

1 0

[U-Boot] (no subject)
by Cote, Sylvain 16 Dec '08

16 Dec '08

Hi, Is it possible to load a initramfs compress CPIO image via u-boot like we can do with a ramdisk image (replace the uRamdisk by a uInitramfs in the command bellow)? nand_all=chpart Kernel;fsload 0x200000 uImage;chpart Config;fsload 0x400000 uRamdisk;run ramargs addip addtty;bootm 200000 400000 If it is possible, I guest we need to generate a different image type via the mkimage utility? Thanks Sylvain

1 0

[U-Boot] [PATCH] common: nvedit to protect additional ethernet addresses Part 1/1
by stefan.althoefer＠web.de 16 Dec '08

16 Dec '08

[PATCH] common: nvedit to protect additional ethernet addresses This patch adds "ethaddr1" and "ethaddr2" to the protected environment variables that can only be written once. ---- The patch is against "latest" u-boot git-repository Please be patient if style of submission or patches are offending. Signed-off-by: stefan.althoefer(a)web.de (as(a)janz.de) ---- diff -uprN u-boot-orig//common/cmd_nvedit.c u-boot/common/cmd_nvedit.c --- u-boot-orig//common/cmd_nvedit.c 2008-12-02 17:25:31.000000000 +0100 +++ u-boot/common/cmd_nvedit.c 2008-12-02 22:59:36.000000000 +0100 @@ -188,6 +188,8 @@ int _do_setenv (int flag, int argc, char #else (strcmp (name, "serial#") == 0) || #endif + (strcmp (name, "ethaddr1") == 0) || + (strcmp (name, "ethaddr2") == 0) || ((strcmp (name, "ethaddr") == 0) #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR) && (strcmp ((char *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)

6 16

[U-Boot] [PATCH] trab: make trab_fkt standalone code independent of libgcc
by Wolfgang Denk 16 Dec '08

16 Dec '08

Use our own local functions in lib_arm/ instead. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- This patch avoids compilation problems with recent toolchains like: arm-linux-ld: ERROR: Source object /opt/eldk-4.2-2008-12-07/usr/bin/../lib/gcc/arm-linux-gnueabi/4.2.2/libgcc.a(_udivsi3.o) has EABI version 4, but target trab_fkt has EABI version 0 arm-linux-ld: failed to merge target specific data of file /opt/eldk-4.2-2008-12-07/usr/bin/../lib/gcc/arm-linux-gnueabi/4.2.2/libgcc.a(_udivsi3.o) board/trab/Makefile | 3 ++- board/trab/trab_fkt.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/board/trab/Makefile b/board/trab/Makefile index 6dfcb87..30e5fbb 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -51,7 +51,8 @@ $(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \ -L$(obj)../../examples -lstubs \ -L$(obj)../../lib_generic -lgeneric \ - -L$(gcclibdir) -lgcc + $(obj)../../lib_arm/div0.o \ + $(obj)../../lib_arm/_*.o $(OBJCOPY) -O srec $(<:.o=) $@ $(obj)trab_fkt.bin: $(obj)trab_fkt.srec diff --git a/board/trab/trab_fkt.c b/board/trab/trab_fkt.c index 93b9490..53cdb5a 100644 --- a/board/trab/trab_fkt.c +++ b/board/trab/trab_fkt.c @@ -294,6 +294,12 @@ int trab_fkt (int argc, char *argv[]) return 1; } +void hang (void) +{ + puts ("### ERROR ### Please RESET the board ###\n"); + for (;;); +} + int do_info (void) { printf ("Stand-alone application for TRAB board function test\n"); -- 1.6.0.4

2 2

[U-Boot] [PATCH 1/3] 85xx: Add support to populate addr map based on TLB settings
by Kumar Gala 16 Dec '08

16 Dec '08

Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- cpu/mpc85xx/tlb.c | 34 ++++++++++++++++++++++++++++++++++ include/asm-ppc/mmu.h | 3 +++ lib_ppc/board.c | 8 ++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/cpu/mpc85xx/tlb.c b/cpu/mpc85xx/tlb.c index a2d16ae..5b5f791 100644 --- a/cpu/mpc85xx/tlb.c +++ b/cpu/mpc85xx/tlb.c @@ -26,6 +26,11 @@ #include <common.h> #include <asm/processor.h> #include <asm/mmu.h> +#ifdef CONFIG_ADDR_MAP +#include <addr_map.h> +#endif + +DECLARE_GLOBAL_DATA_PTR; void set_tlb(u8 tlb, u32 epn, u64 rpn, u8 perms, u8 wimge, @@ -47,6 +52,11 @@ void set_tlb(u8 tlb, u32 epn, u64 rpn, mtspr(MAS7, _mas7); #endif asm volatile("isync;msync;tlbwe;isync"); + +#ifdef CONFIG_ADDR_MAP + if ((tlb == 1) && (gd->flags & GD_FLG_RELOC)) + addrmap_set_entry(epn, rpn, (1UL << ((tsize * 2) + 10)), esel); +#endif } void disable_tlb(u8 esel) @@ -67,6 +77,11 @@ void disable_tlb(u8 esel) mtspr(MAS7, _mas7); #endif asm volatile("isync;msync;tlbwe;isync"); + +#ifdef CONFIG_ADDR_MAP + if (gd->flags & GD_FLG_RELOC) + addrmap_set_entry(0, 0, 0, esel); +#endif } void invalidate_tlb(u8 tlb) @@ -91,6 +106,25 @@ void init_tlbs(void) return ; } +#ifdef CONFIG_ADDR_MAP +void init_addr_map(void) +{ + int i; + + for (i = 0; i < num_tlb_entries; i++) { + if (tlb_table[i].tlb == 0) + continue; + + addrmap_set_entry(tlb_table[i].epn, + tlb_table[i].rpn, + (1UL << ((tlb_table[i].tsize * 2) + 10)), + tlb_table[i].esel); + } + + return ; +} +#endif + unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg) { unsigned int tlb_size; diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index 8975e6c..6d942d0 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h @@ -431,6 +431,9 @@ extern void set_tlb(u8 tlb, u32 epn, u64 rpn, extern void disable_tlb(u8 esel); extern void invalidate_tlb(u8 tlb); extern void init_tlbs(void); +#ifdef CONFIG_ADDR_MAP +extern void init_addr_map(void); +#endif extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg); #define SET_TLB_ENTRY(_tlb, _epn, _rpn, _perms, _wimge, _ts, _esel, _sz, _iprot) \ diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 289a32a..61c29b5 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -75,6 +75,10 @@ #include <keyboard.h> #endif +#ifdef CONFIG_ADDR_MAP +#include <asm/mmu.h> +#endif + #ifdef CONFIG_SYS_UPDATE_FLASH_SIZE extern int update_flash_size (int flash_size); #endif @@ -694,6 +698,10 @@ void board_init_r (gd_t *id, ulong dest_addr) */ trap_init (dest_addr); +#if defined(CONFIG_ADDR_MAP) && defined(CONFIG_E500) + init_addr_map(); +#endif + #if defined(CONFIG_BOARD_EARLY_INIT_R) board_early_init_r (); #endif -- 1.5.6.5

1 2

Re: [U-Boot] [PATCH] common: nvedit to protect additional ethernet addresses Part 1/1
by Stefan Althöfer 16 Dec '08

16 Dec '08

Then maybe we should have #define CONFIG_ENV_PROTECTED_ITEM "ethaddr1,ethaddr2,...." in board configuration to have the greatest flexibility? > stefan.althoefer(a)web.de wrote: > > [PATCH] common: nvedit to protect additional ethernet addresses > > > > This patch adds "ethaddr1" and "ethaddr2" to the protected > > environment variables that can only be written once. > > > > ---- > > The patch is against "latest" u-boot git-repository > > > > Please be patient if style of submission or patches are > > offending. > > > > Signed-off-by: stefan.althoefer(a)web.de (as(a)janz.de) > > > This needs to be above a '---' line. Also, this format is wrong. It > should have a real name and one e-mail address. I recommend using 'git > format-patch' for generating patches. > > ---- > > > > diff -uprN u-boot-orig//common/cmd_nvedit.c u-boot/common/cmd_nvedit.c > > --- u-boot-orig//common/cmd_nvedit.c 2008-12-02 17:25:31.000000000 +0100 > > +++ u-boot/common/cmd_nvedit.c 2008-12-02 22:59:36.000000000 +0100 > > @@ -188,6 +188,8 @@ int _do_setenv (int flag, int argc, char > > #else > > (strcmp (name, "serial#") == 0) || > > #endif > > + (strcmp (name, "ethaddr1") == 0) || > > + (strcmp (name, "ethaddr2") == 0) || > > ((strcmp (name, "ethaddr") == 0) > > > How about this as a more scalable solution: (note that some boards have > up to "ethaddr5") > > (strstr(name, "ethaddr") == name) > > #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR) > > && (strcmp ((char *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0) > > _______________________________________________ > > U-Boot mailing list > > U-Boot(a)lists.denx.de > > http://lists.denx.de/mailman/listinfo/u-boot > > > regards, > Ben > _______________________________________________________________________ Sensationsangebot verlängert: WEB.DE FreeDSL - Telefonanschluss + DSL für nur 16,37 Euro/mtl.!* http://dsl.web.de/?ac=OM.AD.AD008K13805B7069a

4 5

[U-Boot] [PATCH] NAND: Mark the BBT as scanned prior to calling scan_bbt.
by Scott Wood 16 Dec '08

16 Dec '08

Otherwise, recursion can occur if scan_bbt does not find a bad block table, and tries to write one, and the attempt to erase the BBT area causes a bad block check. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- Applied to u-boot-nand-flash. drivers/mtd/nand/nand_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ba05b76..94a65d4 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -460,8 +460,8 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip, struct nand_chip *chip = mtd->priv; if (!(chip->options & NAND_BBT_SCANNED)) { - chip->scan_bbt(mtd); chip->options |= NAND_BBT_SCANNED; + chip->scan_bbt(mtd); } if (!chip->bbt) -- 1.5.6.rc1.6.gc53ad

1 0

[U-Boot] [RFC PATCH 0/6] Some speed improvements to U-Boot JFFS2 code (updated)
by Ilya Yanok 16 Dec '08

16 Dec '08

Hello everybody, here is a set of changes we made to improve U-Boot JFFS2 code performance. We still can't reach Linux's performance but improvements are significant. Patches are againt current u-boot git tree. Any comments are welcome. Regards, Ilya.

5 21

[U-Boot] include/autoconf.mk:212: *** missing separator. Stop.
by Wolfgang Denk 16 Dec '08

16 Dec '08

Hi all... When running "MAKEALL", I see occasional /home/wd/git/u-boot/work/include/autoconf.mk:212: *** missing separator. Stop. errors for some boards. The line numbers are changing (57, 85, 113, 129, 183, 212, 215 etc.), and so are the affected boards (barco, kilauea, MPC8544DS, neo, PM856, sequoia). But the build continues to run and completes successfully without additional warnigns or errors. Repeating the build will show the problem with other line numbers and other boards. The problem is obviously related to running parallel build (this happens on a 4 core system); if I use a single make job it goes away. It looks as if some build step was using autoconf.mk before the task building it has completed. I've searched, but did not find any place where this could happen. Is anybody else experiencing this problem? Any ideas where to look at? 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 Old programmers never die, they just branch to a new address.

2 2

[U-Boot] CONFIG_ENV_ADDR incorrect in MPC8313ERDB.h
by Norbert van Bolhuis 16 Dec '08

16 Dec '08

I built the latest u-boot for MPC8313E-RDB, flashed it, and ran into trouble after saving my environment to flash. I'm using git://git.denx.de/u-boot-nand-flash.git (I believe the "problem" is in other gits as well). I'm booting from NOR flash ('make MPC8313ERDB_33_config') The problem is CONFIG_ENV_ADDR in MPC8313ERDB.h, it says: #define CONFIG_SYS_MONITOR_BASE TEXT_BASE /* start of monitor */ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) I'm not sure what 'monitor' is, but the above makes CONFIG_ENV_ADDR = 0xfe040000. This is incorrect since the resulting u-boot.bin is (in my case) 265356=0x40c8c bytes. So the saveenv overwrites u-boot itself (in my case the av_ variable, causing (k)malloc to crash every next reboot). Although it is only a customization, setting the default CONFIG_ENV_ADDR to a correct value would save 8313E-RDB u-boot users like me the trouble finding this. "#define CONFIG_ENV_ADDR 0xfe080000" works fine for me.

1 0