December 2007 - 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 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] CramFS endianness
by Laurent Pinchart 04 Mar '08

04 Mar '08

Hi everybody, I recently had a problem with cramfs endianness. cramfs tools generates a host-endian file system, which was incompatible with my big-endian MPC8260 system. I patched mkcramfs to reverse the bit order, and was able to read the cramfs image from Linux. However, even though Linux doesn't do any byte swapping, U-Boot assumes little-endian byte order and swap bytes on big-endian architectures. Why is that ? U-Boot and Linux are clearly not compatible on big-endian architectures, and I'd like to fix the problem in the right place. Laurent Pinchart

3 10

[U-Boot-Users] [PATCH] Fix linker scripts: add NOLOAD atribute to .bss/.sbss sections
by Wolfgang Denk 15 Feb '08

15 Feb '08

9 20

[U-Boot-Users] [PATCH] ARM926: compile cpu_init_crit function only if CONFIG_SKIP_LOWLEVEL_INIT is not defined
by Hebbar 14 Feb '08

14 Feb '08

Hi, This patches allows cpu_init_crit function to be compilled only if CONFIG_SKIP_LOWLEVEL_INIT is not defined. At present irrespective of CONFIG_SKIP_LOWLEVEL_INIT, cpu_init_crit is always compilled. This is for arm926ejs module. --- u-boot-1.3.1/cpu/arm926ejs/start.S 2007-12-06 01:21:19.000000000 -0800 +++ uboot/cpu/arm926ejs/start.S 2007-12-19 08:40:37.296875000 -0800 @@ -187,7 +187,7 @@ clbss_l:str r2, [r0] /* clear loop... _start_armboot: .word start_armboot - +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* ************************************************************************* * @@ -225,6 +225,9 @@ cpu_init_crit: bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ mov pc, lr /* back to my caller */ + +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ + /* ************************************************************************* * Signed-off-by: Hebbar I welcome comments, complaints, suggestions and advices. Regards Gururaja -- View this message in context: http://www.nabble.com/-PATCH--ARM926%3A-compile-cpu_init_crit-function-only… Sent from the Uboot - Users mailing list archive at Nabble.com.

3 6

[U-Boot-Users] [PATCH] MPC85xx KGDB support
by Chen Gong 05 Feb '08

05 Feb '08

--- cpu/mpc85xx/Makefile | 4 +- drivers/serial.c | 28 +++++++++++++++++++ include/configs/MPC8548CDS.h | 3 +- lib_ppc/kgdb.c | 62 +++++++++++++++++++++++++++++++++--------- 4 files changed, 81 insertions(+), 16 deletions(-) diff --git a/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile index 32091fa..f5cb148 100644 --- a/cpu/mpc85xx/Makefile +++ b/cpu/mpc85xx/Makefile @@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a -START = start.o resetvec.o +START = start.o resetvec.o kgdb.o COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o \ pci.o serial_scc.o commproc.o ether_fcc.o spd_sdram.o qe_io.o @@ -39,7 +39,7 @@ START := $(addprefix $(obj),$(START)) all: $(obj).depend $(START) $(LIB) $(LIB): $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(obj)kgdb.o ######################################################################### diff --git a/drivers/serial.c b/drivers/serial.c index 76425d8..42585d7 100644 --- a/drivers/serial.c +++ b/drivers/serial.c @@ -307,6 +307,34 @@ serial_setbrg(void) } #endif +#if defined(CONFIG_CMD_KGDB) +void kgdb_serial_init (void) +{ + /* here presume you have been initialzed appropriate COM# */ + _serial_puts("[on serial] ",CONFIG_KGDB_SER_INDEX); +} + +void putDebugChar (int c) +{ + _serial_putc(c, CONFIG_KGDB_SER_INDEX); +} + +void putDebugStr (const char *str) +{ + _serial_puts(str, CONFIG_KGDB_SER_INDEX); +} + +int getDebugChar (void) +{ + return _serial_getc(CONFIG_KGDB_SER_INDEX); +} + +void kgdb_interruptible (int yes) +{ + return; +} +#endif + #if defined(CONFIG_SERIAL_MULTI) DECLARE_ESERIAL_FUNCTIONS(1); diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 6083715..396feeb 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -482,6 +482,7 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_PING #define CONFIG_CMD_I2C #define CONFIG_CMD_MII +#define CONFIG_CMD_KGDB #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI @@ -529,7 +530,7 @@ extern unsigned long get_clock_freq(void); #define BOOTFLAG_WARM 0x02 /* Software reboot */ #if defined(CONFIG_CMD_KGDB) -#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ +#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif diff --git a/lib_ppc/kgdb.c b/lib_ppc/kgdb.c index 78c2f0c..7acdebc 100644 --- a/lib_ppc/kgdb.c +++ b/lib_ppc/kgdb.c @@ -60,20 +60,46 @@ static struct hard_trap_info unsigned int tt; /* Trap type code for powerpc */ unsigned char signo; /* Signal that we map this trap into */ } hard_trap_info[] = { - { 0x200, SIGSEGV }, /* machine check */ - { 0x300, SIGSEGV }, /* address error (store) */ - { 0x400, SIGBUS }, /* instruction bus error */ - { 0x500, SIGINT }, /* interrupt */ - { 0x600, SIGBUS }, /* alingment */ - { 0x700, SIGTRAP }, /* breakpoint trap */ - { 0x800, SIGFPE }, /* fpu unavail */ - { 0x900, SIGALRM }, /* decrementer */ - { 0xa00, SIGILL }, /* reserved */ - { 0xb00, SIGILL }, /* reserved */ - { 0xc00, SIGCHLD }, /* syscall */ - { 0xd00, SIGTRAP }, /* single-step/watch */ - { 0xe00, SIGFPE }, /* fp assist */ +#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) + { 0x100, SIGINT }, /* critical input interrupt */ + { 0x200, SIGSEGV }, /* machine check */ + { 0x300, SIGSEGV }, /* data storage */ + { 0x400, SIGBUS }, /* instruction storage */ + { 0x500, SIGINT }, /* interrupt */ + { 0x600, SIGBUS }, /* alignment */ + { 0x700, SIGILL }, /* program */ + { 0x800, SIGILL }, /* reserved */ + { 0x900, SIGILL }, /* reserved */ + { 0xa00, SIGILL }, /* reserved */ + { 0xb00, SIGILL }, /* reserved */ + { 0xc00, SIGCHLD }, /* syscall */ + { 0xd00, SIGILL }, /* reserved */ + { 0xe00, SIGILL }, /* reserved */ + { 0xf00, SIGILL }, /* reserved */ + /* + * 0x1000 PIT + * 0x1010 FIT + * 0x1020 watchdog + * 0x1100 data TLB miss + * 0x1200 instruction TLB miss + */ + { 0x2002, SIGTRAP}, /* debug */ +#else + { 0x200, SIGSEGV }, /* machine check */ + { 0x300, SIGSEGV }, /* address error (store) */ + { 0x400, SIGBUS }, /* instruction bus error */ + { 0x500, SIGINT }, /* interrupt */ + { 0x600, SIGBUS }, /* alingment */ + { 0x700, SIGTRAP }, /* breakpoint trap */ + { 0x800, SIGFPE }, /* fpu unavail */ + { 0x900, SIGALRM }, /* decrementer */ + { 0xa00, SIGILL }, /* reserved */ + { 0xb00, SIGILL }, /* reserved */ + { 0xc00, SIGCHLD }, /* syscall */ + { 0xd00, SIGTRAP }, /* single-step/watch */ + { 0xe00, SIGFPE }, /* fp assist */ { 0, 0} /* Must be last */ +#endif }; static int @@ -100,7 +126,12 @@ kgdb_enter(struct pt_regs *regs, kgdb_data *kdp) /* Skip over breakpoint trap insn */ regs->nip += 4; } +#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) + mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~DBCR_IC); + regs->msr &= ~MSR_DE; +#else regs->msr &= ~MSR_SE; +#endif /* reply to host that an exception has occurred */ kdp->sigval = computeSignal(regs->trap); @@ -130,7 +161,12 @@ kgdb_exit(struct pt_regs *regs, kgdb_data *kdp) break; case KGDBEXIT_SINGLE: +#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) + mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR_IC); + regs->msr |= MSR_DE; +#else regs->msr |= MSR_SE; +#endif #if 0 set_msr(msr | MSR_SE); #endif -- 1.5.2

4 3

[U-Boot-Users] [PATCH] ARM926: Display Ethernet info in do_bdinfo only if CONFIG_CMD_NET is defined
by Hebbar 05 Feb '08

05 Feb '08

Hi, This Patch adds if define to bdinfo command to display ethernet information only if CONFIG_CMD_NET is defined for arm modules. --- u-boot-1.3.1/common/cmd_bdinfo.c 2007-12-06 01:21:19.000000000 -0800 +++ uboot/common/cmd_bdinfo.c 2007-12-18 19:46:41.625000000 -0800 @@ -314,6 +314,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int fl print_num("-> size", bd->bi_dram[i].size); } +#if defined(CONFIG_CMD_NET) puts ("ethaddr ="); for (i=0; i<6; ++i) { printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); @@ -321,6 +322,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int fl puts ( "\n" "ip_addr = "); print_IPaddr (bd->bi_ip_addr); +#endif printf ("\n" "baudrate = %d bps\n", bd->bi_baudrate); Signed-off-by: Hebbar I welcome comments, complaints, suggestions and advices. Regards Gururaja -- View this message in context: http://www.nabble.com/-PATCH--ARM926%3A-Display-Ethernet-info-in-do_bdinfo-… Sent from the Uboot - Users mailing list archive at Nabble.com.

6 9