January 2008 - U-Boot

[U-Boot-Users] [PATCH] Fixed pcnet io_base
by Vlad Lungu 25 Apr '08

25 Apr '08

Bus and phys address are not always the same Signed-off-by: Vlad Lungu <vlad(a)comsys.ro> --- drivers/pcnet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/pcnet.c b/drivers/pcnet.c index 2af0e8f..22edb48 100644 --- a/drivers/pcnet.c +++ b/drivers/pcnet.c @@ -196,6 +196,7 @@ int pcnet_initialize(bd_t *bis) * Setup the PCI device. */ pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, (unsigned int *)&dev->iobase); + dev->iobase=pci_io_to_phys(devbusfn,dev->iobase); dev->iobase &= ~0xf; PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%x: ", -- 1.5.2.2

3 4

[U-Boot-Users] [PATCH] Added Am79C970A chip id to pcnet
by Vlad Lungu 25 Apr '08

25 Apr '08

Signed-off-by: Vlad Lungu <vlad(a)comsys.ro> --- drivers/pcnet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/pcnet.c b/drivers/pcnet.c index 22edb48..3424846 100644 --- a/drivers/pcnet.c +++ b/drivers/pcnet.c @@ -261,6 +261,9 @@ static int pcnet_probe(struct eth_device* dev, bd_t *bis, int dev_nr) return -1; chip_version = (chip_version >> 12) & 0xffff; switch (chip_version) { + case 0x2621: + chipname = "PCnet/PCI II 79C970A"; /* PCI */ + break; #ifdef CONFIG_PCNET_79C973 case 0x2625: chipname = "PCnet/FAST III 79C973"; /* PCI */ -- 1.5.2.2

2 1

[U-Boot-Users] PATCH - Fix oob data copied into supplied buffer
by Troy Kisky 21 Apr '08

21 Apr '08

This patch correctly sets the oobavail variable and fixes a bug where the oob data was not valid when there where multiple groups in oobfree. It also defines a new variable so that you can tell which parts of a large page have ecc errors. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c index 151f535..45b8fb0 100644 --- a/drivers/nand/nand_base.c +++ b/drivers/nand/nand_base.c @@ -931,7 +931,7 @@ static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int pa for (i = 0; i < eccbytes; i++, eccidx++) oob_buf[oob_config[eccidx]] = ecc_code[i]; /* If the hardware ecc provides syndromes then - * the ecc code must be written immidiately after + * the ecc code must be written immediately after * the data bytes (words) */ if (this->options & NAND_HWECC_SYNDROME) this->write_buf(mtd, ecc_code, eccbytes); @@ -1092,7 +1092,7 @@ static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * re return nand_read_ecc (mtd, from, len, retlen, buf, NULL, NULL); } - +ulong eccReadMask; /* bitmask off ecc err groups*/ /** * nand_read_ecc - [MTD Interface] Read data with ECC * @mtd: MTD device structure @@ -1267,6 +1267,7 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, ecc_code[j] = oob_data[oob_config[j]]; /* correct data, if neccecary */ + eccReadMask = 0; for (i = 0, j = 0, datidx = 0; i < this->eccsteps; i++, datidx += ecc) { ecc_status = this->correct_data(mtd, &data_poi[datidx], &ecc_code[j], &ecc_calc[j]); @@ -1283,6 +1284,7 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, } if (ecc_status == -1) { + eccReadMask |= (1<<i); DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " "Failed ECC read, page 0x%08x\n", page); ecc_failed++; } @@ -1299,7 +1301,7 @@ static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, for (i = 0, j = 0; j < mtd->oobavail; i++) { int from = oobsel->oobfree[i][0]; int num = oobsel->oobfree[i][1]; - memcpy(&oob_buf[oob], &oob_data[from], num); + memcpy(&oob_buf[oob+j], &oob_data[from], num); j+= num; } oob += mtd->oobavail; @@ -1644,8 +1646,10 @@ static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len, this->select_chip(mtd, chipnr); /* Check, if it is write protected */ - if (nand_check_wp(mtd)) + if (nand_check_wp(mtd)) { + printk (KERN_NOTICE "nand_write_ecc: Device is write protected\n"); goto out; + } /* if oobsel is NULL, use chip defaults */ if (oobsel == NULL) @@ -2486,12 +2490,9 @@ int nand_scan (struct mtd_info *mtd, int maxchips) /* The number of bytes available for the filesystem to place fs dependend * oob data */ - if (this->options & NAND_BUSWIDTH_16) { - mtd->oobavail = mtd->oobsize - (this->autooob->eccbytes + 2); - if (this->autooob->eccbytes & 0x01) - mtd->oobavail--; - } else - mtd->oobavail = mtd->oobsize - (this->autooob->eccbytes + 1); + mtd->oobavail = 0; + for (i=0; this->autooob->oobfree[i][1]; i++) + mtd->oobavail += this->autooob->oobfree[i][1]; /* * check ECC mode, default to software

4 5

[U-Boot-Users] [PATCH] Add support for u-boot in svn and localversion-* files
by Mike Frysinger 20 Apr '08

20 Apr '08

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tools/setlocalversion | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/setlocalversion b/tools/setlocalversion index 9a23825..5ff7f2e 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -19,4 +19,18 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then if git diff-files | read dummy; then printf '%s' -dirty fi + + # Is this git on svn? + if git config --get svn-remote.svn.url >/dev/null; then + printf -- '-svn%s' "`git-svn find-rev $head`" + fi fi + +# Check for svn and a svn repo. +if rev=`svn info 2>/dev/null` ; then + rev=`echo "${rev}" | grep '^Revision' | awk '{print $NF}'` + printf -- '-svn%s' $rev +fi + +# Check for any localversion-* files +printf '%s' "`cat localversion-* 2>/dev/null`" -- 1.5.3.8

5 9

[U-Boot-Users] [PATCH] Use `ln -sf` rather than `rm -f && ln -s`
by Mike Frysinger 14 Apr '08

14 Apr '08

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- tools/Makefile | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index af0de47..22d9dae 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -203,19 +203,16 @@ else endif $(obj)environment.c: - @rm -f $(obj)environment.c - ln -s $(src)../common/environment.c $(obj)environment.c + ln -s -f $(src)../common/environment.c $(obj)environment.c $(obj)environment.o: $(obj)environment.c $(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $< $(obj)crc32.c: - @rm -f $(obj)crc32.c - ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c + ln -s -f $(src)../lib_generic/crc32.c $(obj)crc32.c $(obj)sha1.c: - @rm -f $(obj)sha1.c - ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c + ln -s -f $(src)../lib_generic/sha1.c $(obj)sha1.c $(LOGO_H): $(obj)bmp_logo $(LOGO_BMP) $(obj)./bmp_logo $(LOGO_BMP) >$@ -- 1.5.3.8

4 10

[U-Boot-Users] [patch] disable caches before booting an app for Blackfin apps
by Mike Frysinger 14 Apr '08

14 Apr '08

It isn't generally save to execute applications outside of U-Boot with caches enabled due to the way the Blackfin processor handles caches (requires software assistance). This patch disables caches before booting an ELF or just booting raw code. The previous discussion on the patch was that we wanted to use weaks instead, but that proved to not be feasible when multiple symbols are involved, which puts us back at the ifdef solution. I've minimized the ugliness by moving the setup step outside of the main function. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- diff --git a/common/cmd_boot.c b/common/cmd_boot.c index e68f16f..9d4f026 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -32,6 +32,23 @@ DECLARE_GLOBAL_DATA_PTR; #endif +static inline void go_setup(int argc, char *argv[]) +{ +#if defined(CONFIG_I386) + /* + * x86 does not use a dedicated register to pass the pointer + * to the global_data + */ + argv[0] = (char *)gd; + +#elif defined(CONFIG_BLACKFIN) + if (dcache_status ()) + dcache_disable (); + if (icache_status ()) + icache_disable (); +#endif +} + int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong addr, rc; @@ -46,25 +63,20 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) printf ("## Starting application at 0x%08lX ...\n", addr); + go_setup(argc, argv); + +#if defined(CONFIG_NIOS) /* - * pass address parameter as argv[0] (aka command name), - * and all remaining args - */ -#if defined(CONFIG_I386) - /* - * x86 does not use a dedicated register to pass the pointer - * to the global_data + * Nios function pointers are address >> 1 */ - argv[0] = (char *)gd; + addr >>= 1; #endif -#if !defined(CONFIG_NIOS) - rc = ((ulong (*)(int, char *[]))addr) (--argc, &argv[1]); -#else + /* - * Nios function pointers are address >> 1 + * pass address parameter as argv[0] (aka command name), + * and all remaining args */ - rc = ((ulong (*)(int, char *[]))(addr>>1)) (--argc, &argv[1]); -#endif + rc = ((ulong (*)(int, char *[]))addr) (--argc, &argv[1]); if (rc != 0) rcode = 1; printf ("## Application terminated, rc = 0x%lX\n", rc); diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 2eb7453..4683554 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -27,6 +27,21 @@ DECLARE_GLOBAL_DATA_PTR; #define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif +static inline void bootelf_setup(int argc, char *argv[]) +{ + /* + * QNX images require the data cache is disabled. + * Data cache is already flushed, so just turn it off. + */ + if (dcache_status ()) + dcache_disable (); + +#ifdef CONFIG_BLACKFIN + if (icache_status ()) + icache_disable (); +#endif +} + int valid_elf_image (unsigned long addr); unsigned long load_elf_image (unsigned long addr); @@ -53,12 +68,7 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) printf ("## Starting application at 0x%08lx ...\n", addr); - /* - * QNX images require the data cache is disabled. - * Data cache is already flushed, so just turn it off. - */ - if (dcache_status ()) - dcache_disable (); + bootelf_setup(argc, argv); /* * pass address parameter as argv[0] (aka command name),

3 3

[U-Boot-Users] [PATCH] add support for Toradex Colibri module
by Daniel Mack 14 Apr '08

14 Apr '08

Hi, this patch adds basic support for Toradex PXA27x based Colibri module. It cleanly applies on u-boot-1.1.6. However, I didn't manage to get the flash to work at all, at boot time, I always get the message "Flash: 0 kB". I'm new to the U-Boot environment, so maybe I missed same essentials here. Also, the DM9000 driver does not seem to be able to correctly read its MAC address on this platform. I've read some mails about similar behaviour. Is there any patch going upstream soon? For now, I helped myself by hacking a fake MAC to bd->bi_enetaddr right before initialization but that's of course not a solution. Thanks and best regards, Daniel

3 8

[U-Boot-Users] [Patch] Disable icache before call the first line of kernel in do_bootelf().
by Sonic Zhang 14 Apr '08

14 Apr '08

On some architecture, it is not save to call the first line of kernel without disable the instruction cache. For do_bootm() path, architecture specific library code do_bootm_linux() can adress this issue, but do_bootelf() is common code. This patch disables icache before call kernel. Signed-off-by: Sonic Zhang <sonic.zhang(a)gmail.com> Index: common/cmd_elf.c =================================================================== --- common/cmd_elf.c (revision 871) +++ common/cmd_elf.c (working copy) @@ -65,6 +65,8 @@ */ if (dcache_status ()) dcache_disable (); + if (icache_status ()) + icache_disable (); /* pass cmdline to the kernel. */ cmdline = make_command_line();

7 21

[U-Boot-Users] [patch u-boot git 2/3] better ARM9 compiler options
by David Brownell 30 Mar '08

30 Mar '08

Update some ARM9 builds to pass the exact CPU to GCC, when the compiler supports that specification. This stops pessimizing codegen, and removes voluminous warnings about (no) interworking support from EABI compilers. (Like CodeSourcery's ARM 2007q3 release.) Signed-off-by: David Brownell <dbrownell(a)users.sourceforge.net> --- u-boot.orig/cpu/arm920t/config.mk 2008-01-13 10:42:55.000000000 -0800 +++ u-boot/cpu/arm920t/config.mk 2008-01-13 11:05:02.000000000 -0800 @@ -24,11 +24,11 @@ PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -msoft-float -PLATFORM_CPPFLAGS += -march=armv4 # ========================================================================= # # Supply options according to compiler version # # ========================================================================= +PLATFORM_CPPFLAGS +=$(call cc-option,-mcpu=arm920t,-march=armv4) PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) --- u-boot.orig/cpu/arm926ejs/config.mk 2008-01-13 10:42:55.000000000 -0800 +++ u-boot/cpu/arm926ejs/config.mk 2008-01-13 11:04:56.000000000 -0800 @@ -24,11 +24,11 @@ PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -msoft-float -PLATFORM_CPPFLAGS += -march=armv4 # ========================================================================= # # Supply options according to compiler version # # ========================================================================= +PLATFORM_CPPFLAGS +=$(call cc-option,-mcpu=arm926ej-s,-march=armv4) PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))

4 4

[U-Boot-Users] [patch u-boot git 3/3] use correct at91rm9200 register name
by David Brownell 30 Mar '08

30 Mar '08

This fixes a naming bug for at91rm9200 lowlevel init code: NOR boot flash is on chipselect 0, not chipselect 2. This makes code use the register name from chip datasheets. Signed-off-by: David Brownell <dbrownell(a)users.sourceforge.net> --- cpu/arm920t/at91rm9200/lowlevel_init.S | 6 +++--- include/configs/at91rm9200dk.h | 2 +- include/configs/cmc_pu2.h | 2 +- include/configs/csb637.h | 2 +- include/configs/mp2usb.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) --- u-boot.orig/cpu/arm920t/at91rm9200/lowlevel_init.S 2008-01-14 00:29:44.000000000 -0800 +++ u-boot/cpu/arm920t/at91rm9200/lowlevel_init.S 2008-01-14 00:31:32.000000000 -0800 @@ -46,7 +46,7 @@ #define MC_ASR 0xFFFFFF04 #define MC_AASR 0xFFFFFF08 #define EBI_CFGR 0xFFFFFF64 -#define SMC2_CSR 0xFFFFFF70 +#define SMC_CSR0 0xFFFFFF70 /* clocks */ #define PLLAR 0xFFFFFC28 @@ -146,8 +146,8 @@ SMRDATA: .word MC_AASR_VAL .word EBI_CFGR .word EBI_CFGR_VAL - .word SMC2_CSR - .word SMC2_CSR_VAL + .word SMC_CSR0 + .word SMC_CSR0_VAL .word PLLAR .word PLLAR_VAL .word PLLBR --- u-boot.orig/include/configs/at91rm9200dk.h 2008-01-14 00:35:42.000000000 -0800 +++ u-boot/include/configs/at91rm9200dk.h 2008-01-14 00:36:02.000000000 -0800 @@ -51,7 +51,7 @@ #define MC_ASR_VAL 0x00000000 #define MC_AASR_VAL 0x00000000 #define EBI_CFGR_VAL 0x00000000 -#define SMC2_CSR_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ +#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ /* clocks */ #define PLLAR_VAL 0x20263E04 /* 179.712000 MHz for PCK */ --- u-boot.orig/include/configs/cmc_pu2.h 2008-01-14 00:35:43.000000000 -0800 +++ u-boot/include/configs/cmc_pu2.h 2008-01-14 00:36:05.000000000 -0800 @@ -50,7 +50,7 @@ #define MC_ASR_VAL 0x00000000 #define MC_AASR_VAL 0x00000000 #define EBI_CFGR_VAL 0x00000000 -#define SMC2_CSR_VAL 0x100032ad /* 16bit, 2 TDF, 4 WS */ +#define SMC_CSR0_VAL 0x100032ad /* 16bit, 2 TDF, 4 WS */ /* clocks */ #define PLLAR_VAL 0x2026BE04 /* 179,712 MHz for PCK */ --- u-boot.orig/include/configs/csb637.h 2008-01-14 00:35:43.000000000 -0800 +++ u-boot/include/configs/csb637.h 2008-01-14 00:36:08.000000000 -0800 @@ -51,7 +51,7 @@ #define MC_ASR_VAL 0x00000000 #define MC_AASR_VAL 0x00000000 #define EBI_CFGR_VAL 0x00000000 -#define SMC2_CSR_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ +#define SMC_CSR0_VAL 0x00003284 /* 16bit, 2 TDF, 4 WS */ /* clocks */ #define PLLAR_VAL 0x2031BE01 /* 184.320000 MHz for PCK */ --- u-boot.orig/include/configs/mp2usb.h 2008-01-14 00:35:43.000000000 -0800 +++ u-boot/include/configs/mp2usb.h 2008-01-14 00:36:11.000000000 -0800 @@ -55,7 +55,7 @@ #define MC_ASR_VAL 0x00000000 #define MC_AASR_VAL 0x00000000 #define EBI_CFGR_VAL 0x00000000 -#define SMC2_CSR_VAL 0x00003084 /* 16bit, 2 TDF, 4 WS */ +#define SMC_CSR0_VAL 0x00003084 /* 16bit, 2 TDF, 4 WS */ /* clocks */ #define PLLAR_VAL 0x20263E04 /* 180 MHz for PCK */

3 3