July 2009 - U-Boot

[U-Boot] MPC8313 board hanging
by Patrick Heffernan 29 Jul '09

29 Jul '09

Hi, I'm working on a custom MPC8313 board. It was booting up fine using NOR flash and ext2 filesystem. Configured u-boot and Linux and made transition to use NAND flash and JFFS2 filesystem and now system hangs when running Linux kernel. I've tried different things but I'm stuck. Thanks in advance for any help. pat Here is my boot-up sequence: NAND SPL - U-Boot 1.3.0 (Jul 27 2009 - 12:23:07) MPC83XX Loading from NAND : ........................ U-Boot 1.3.0 (Jul 27 2009 - 12:22:36) MPC83XX Reset Status: Software Hard , External/Internal Soft , External/Internal Hard CPU: e300c3, MPC8313, Rev: 10 at 266.666 MHz, CSB: 133 MHz Board: Validator 2 Prototype NAND Base = 0xe3000000 ENV Base = 0xf8000 I2C: ready DRAM: 128 MB Top of RAM usable for U-Boot at: 08000000 Reserving 340k for U-Boot at: 07faa000 Reserving 528k for malloc() at: 07f26000 Reserving 68 Bytes for Board Info at: 07f25fbc Reserving 96 Bytes for Global Data at: 07f25f5c Stack Pointer at: 07f25f38 New Stack Pointer is: 07f25f38 Now running in RAM - U-Boot at: 07faa000 FLASH: flash detect cfi fwc addr fe000000 cmd 0 0 8bit x 8 bit fwc addr fe000055 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr fe000010 is= 0 51 fwc addr fe000555 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr fe000010 is= 0 51 fwc addr fe000000 cmd 0 0000 16bit x 8 bit fwc addr fe0000aa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr fe000020 is= 0051 5151 fwc addr fe000aaa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr fe000020 is= 0051 5151 fwc addr fe000000 cmd 0 0000 16bit x 16 bit fwc addr fe0000aa cmd 98 0098 16bit x 16 bit is= cmd 51(Q) addr fe000020 is= 0051 0051 is= cmd 52(R) addr fe000022 is= 0052 0052 is= cmd 59(Y) addr fe000024 is= 0059 0059 ushort addr is at fe000050 info->portwidth = 2 addr[0] = 0x0 addr[1] = 0x2 addr[2] = 0x0 addr[3] = 0x0 retval = 0x2 device interface is 2 found port 2 chip 2 port 16 bits chip 16 bits ushort addr is at fe000026 info->portwidth = 2 addr[0] = 0x0 addr[1] = 0x2 addr[2] = 0x0 addr[3] = 0x0 retval = 0x2 fwc addr fe000000 cmd f0 00f0 16bit x 16 bit fwc addr fe000aaa cmd aa 00aa 16bit x 16 bit fwc addr fe000554 cmd 55 0055 16bit x 16 bit fwc addr fe000aaa cmd 90 0090 16bit x 16 bit fwc addr fe000000 cmd f0 00f0 16bit x 16 bit fwc addr fe0000aa cmd 98 0098 16bit x 16 bit ushort addr is at fe00002a info->portwidth = 2 addr[0] = 0x0 addr[1] = 0x40 addr[2] = 0x0 addr[3] = 0x0 retval = 0x40 fe000020 : 00 51 00 52 00 59 00 02 00 00 00 40 00 00 00 00 .Q.R.Y.....@.... fe000030 : 00 00 00 00 00 00 00 27 00 36 00 00 00 00 00 04 .......'.6...... fe000040 : 00 00 00 0a 00 00 00 05 00 00 00 04 00 00 00 17 ................ fe000050 : 00 02 00 00 00 00 00 00 00 02 00 07 00 00 00 20 ............... fe000060 : 00 00 00 7e 00 00 00 00 00 01 00 00 00 00 00 00 ...~............ fe000070 : 00 00 00 00 00 00 00 00 00 00 ff ff ff ff ff ff ................ fe000080 : 00 50 00 52 00 49 00 31 00 31 00 00 00 02 00 04 .P.R.I.1.1...... fe000090 : 00 01 00 04 00 00 00 00 00 00 00 b5 00 c5 00 03 ................ manufacturer is 2 manufacturer id is 0xc2 device id is 0xc9 device id2 is 0x0 cfi version is 0x3131 size_ratio 1 port 16 bits chip 16 bits found 2 erase regions long addr is at fe000062 info->portwidth = 2 addr[0] = 0x0 addr[1] = 0x7e addr[2] = 0x0 addr[3] = 0x0 addr[4] = 0x0 addr[5] = 0x0 addr[6] = 0x0 addr[7] = 0x1 erase_region_count = 127 erase_region_size = 65536 long addr is at fe00005a info->portwidth = 2 addr[0] = 0x0 addr[1] = 0x7 addr[2] = 0x0 addr[3] = 0x0 addr[4] = 0x0 addr[5] = 0x20 addr[6] = 0x0 addr[7] = 0x0 erase_region_count = 8 erase_region_size = 8192 ushort addr is at fe000054 info->portwidth = 2 addr[0] = 0x0 addr[1] = 0x0 addr[2] = 0x0 addr[3] = 0x0 retval = 0x0 fwc addr fe000000 cmd f0 00f0 16bit x 16 bit 8 MB NAND: 64 MiB In: serial Out: serial Err: serial U-Boot relocated to 07faa000 Net: TSEC0: PHY is LSI ET1011C2 1000BASE-T Full duplex (282f014) TSEC1: PHY is LSI ET1011C2 1000BASE-T Full duplex (282f014) TSEC0, TSEC1 [PRIME] ### main_loop entered: bootdelay=2 ### main_loop: bootcmd="run read_kernel; run read_dtb; bootm 200000 - 500000" Hit any key to stop autoboot: 0 NAND read: device 0 offset 0x100000, size 0x300000 3145728 bytes read: OK NAND read: device 0 offset 0x400000, size 0x100000 1048576 bytes read: OK ## Booting image at 00200000 ... Image Name: Linux-2.6.23 Created: 2009-07-21 19:40:44 UTC Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2084801 Bytes = 2 MB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK Uncompressing Kernel Image ... OK ## Current stack ends at 0x07F25D10 => set upper limit to 0x00800000 ## cmdline at 0x007FFC00 ... 0x007FFC72 bd address = 0x07F25FBC memstart = 0x00000000 memsize = 0x08000000 flashstart = 0xFE000000 flashsize = 0x00800000 flashoffset = 0x00000000 sramstart = 0x00000000 sramsize = 0x00000000 bootflags = 0x00000001 intfreq = 266.666 MHz busfreq = 133.333 MHz ethaddr = 00:E0:0C:00:95:01 eth1addr = 00:E0:0C:00:95:02 IP addr = 10.1.133.218 baudrate = 115200 bps Kernel address = 00000000 Skipping initrd Booting using the fdt at 0x500000 No initrd CFG_BOOTMAPSZ = 0x800000 TB Freq - Couldn't find /cpus/PowerPC,8313@0: <valid offset/length> Busfreq - Couldn't find /cpus/PowerPC,8313@0: <valid offset/length> Clock freq - Couldn't find /cpus/PowerPC,8313@0: <valid offset/length> Busfreq - Couldn't find /soc8313@e0000000: <valid offset/length> Busfreq - Couldn't find /soc8313@e0000000/serial@4500: <valid offset/length> Busfreq - Couldn't find /soc8313@e0000000/serial@4600: <valid offset/length> ## Transferring control to Linux (at address 00000000) ... Kernel poiner = 0x0 FDT pointer = 0x500000 Physical pointer = 0x0 Running Linux Here is my u-boot environment: => printenv ramboot=setenv rootdev /dev/ram;run setbootargs;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr nfsboot=setenv rootdev /dev/nfs;run setbootargs;run setipargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr bootdelay=2 baudrate=115200 loads_echo=1 ethaddr=00:E0:0C:00:95:01 eth1addr=00:E0:0C:00:95:02 ipaddr=10.1.133.218 serverip=10.1.133.200 rootpath=/nfs/root/path gatewayip=10.1.133.1 netmask=255.255.255.0 hostname=val2 bootfile=uImage loadaddr=200000 uboot_file=./u-boot.bin uboot_flash_addr=0xfe000000 uboot_flash_last=0xfe04ffff dt_file=./mpc8313erdb.dtb dt_flash_addr=0xfe050000 dt_flash_last=0xfe05ffff env_flash_addr=0xfe060000 env_flash_last=0xfe06ffff kernel_file=./uImage kernel_flash_addr=0xfe070000 kernel_flash_last=0xfe24ffff ramdisk_file=./rootfs.ext2.gz.uboot ramdisk_flash_addr=0xfe250000 ramdisk_flash_last=0xfe7fffff load_uboot=tftp $loadaddr $uboot_file update_uboot=protect off $uboot_flash_addr $uboot_flash_last; era $uboot_flash_addr $uboot_flash_last; cp.b $fileaddr $uboot_flash_addr $filesize; protect on $uboot_flash_addr $uboot_flash_last burn_uboot=run load_uboot;run update_uboot load_dt=tftp $loadaddr $dt_file update_dt=protect off $dt_flash_addr $dt_flash_last; era $dt_flash_addr $dt_flash_last; cp.b $fileaddr $dt_flash_addr $filesize burn_dt=run load_dt;run update_dt load_kernel=tftp $loadaddr $kernel_file update_kernel=protect off $kernel_flash_addr $kernel_flash_last; era $kernel_flash_addr $kernel_flash_last; cp.b $fileaddr $kernel_flash_addr $filesize burn_kernel=run load_kernel;run update_kernel load_ramdisk=tftp $loadaddr $ramdisk_file update_ramdisk=protect off $ramdisk_flash_addr $ramdisk_flash_last; era $ramdisk_flash_addr $ramdisk_flash_last; cp.b $fileaddr $ramdisk_flash_addr $filesize burn_ramdisk=run load_ramdisk;run update_ramdisk netdev=eth1 ethprime=TSEC1 uboot=u-boot.bin console=ttyS0 nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} ramargs=setenv bootargs root=/dev/ram rw ramdisk_size=124M addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:o ff panic=1 addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate} run ramargs; run addtty; bootm $kernel_flash_addr $ramdisk_flash_addr $dt_flash_addr mtdids=nand0=nand0 mtdparts=mtdparts=nand0:1M(u-boot),3M(kernel),1M(dtb),-(jffs2) partition=nand0,3 mtddevnum=3 mtddevname=jffs2 bootargs=root=/dev/mtdblock3 rw rootfstype=jffs2 console=ttyS0,115200 mtdparts=nand0:1M(u-boot),3M(kernel),1M(dtb),-(jffs2) read_kernel=nand read 200000 kernel read_dtb=nand read 500000 dtb bootcmd=run read_kernel; run read_dtb; bootm 200000 - 500000 stdin=serial stdout=serial stderr=serial ethact=TSEC1 Environment size: 2777/16380 bytes

2 2

[U-Boot] [PATCH] Fix FEC compile warning message
by TsiChung Liew 29 Jul '09

29 Jul '09

Provide function protocol for icache_invalid(). Signed-off-by: TsiChung Liew <tsicliew(a)gmail.com> --- drivers/net/mcffec.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 64be5de..d3741a7 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -95,6 +95,10 @@ struct fec_info_s fec_info[] = { #endif }; +#ifdef CONFIG_SYS_UNIFY_CACHE +extern void icache_invalid(void); +#endif + int fec_send(struct eth_device *dev, volatile void *packet, int length); int fec_recv(struct eth_device *dev); int fec_init(struct eth_device *dev, bd_t * bd); -- 1.5.6.4

3 2

[U-Boot] [PATCH 1/2] Removed CONFIG_NUM_CPUS for 85xx and 86xx Freescale processors.
by Poonam Aggrwal 28 Jul '09

28 Jul '09

The number of CPUs are getting detected dynamically by checking the processor SVR value. Also removed CONFIG_NUM_CPUS references from all the platforms with 85xx/86xx processors. This can help to use the same u-boot image across the platforms. Also revamped and corrected few Freescale Copyright messages. Signed-off-by: Poonam Aggrwal <poonam.aggrwal(a)freescale.com> --- common/cmd_mp.c | 6 +- cpu/mpc85xx/cpu.c | 111 ++++++++++++++++++++++++++--------------- cpu/mpc85xx/mp.c | 6 +- cpu/mpc85xx/release.S | 25 +++++++++- cpu/mpc85xx/speed.c | 4 +- cpu/mpc86xx/cpu.c | 44 ++++++++++++++-- cpu/mpc86xx/cpu_init.c | 2 +- include/asm-ppc/config.h | 41 +++++++++++++++ include/asm-ppc/global_data.h | 4 ++ include/asm-ppc/processor.h | 5 +- include/common.h | 2 + include/configs/MPC8572DS.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/P2020DS.h | 1 - include/configs/XPEDITE5170.h | 1 - include/configs/XPEDITE5370.h | 1 - include/configs/sbc8641d.h | 1 - include/e500.h | 6 +-- lib_ppc/board.c | 4 ++ lib_ppc/bootm.c | 2 +- 21 files changed, 197 insertions(+), 72 deletions(-) diff --git a/common/cmd_mp.c b/common/cmd_mp.c index faa8700..4f2c639 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Freescale Semiconductor, Inc. + * Copyright (C) 2008-2009 Freescale Semiconductor, Inc. All rights reserved. * * See file CREDITS for list of people who contributed to this * project. @@ -34,9 +34,9 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } cpuid = simple_strtoul(argv[1], NULL, 10); - if (cpuid >= CONFIG_NUM_CPUS) { + if (cpuid >= cpu_numcores()) { printf ("Core num: %lu is out of range[0..%d]\n", - cpuid, CONFIG_NUM_CPUS - 1); + cpuid, cpu_numcores() - 1); return 1; } diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 28c6119..ff7bff1 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -1,5 +1,5 @@ /* - * Copyright 2004,2007,2008 Freescale Semiconductor, Inc. + * Copyright(C) 2004,2007-2009 Freescale Semiconductor, Inc. All rights reserved. * (C) Copyright 2002, 2003 Motorola Inc. * Xianghua Xiao (X.Xiao(a)motorola.com) * @@ -38,37 +38,37 @@ DECLARE_GLOBAL_DATA_PTR; struct cpu_type cpu_type_list [] = { - CPU_TYPE_ENTRY(8533, 8533), - CPU_TYPE_ENTRY(8533, 8533_E), - CPU_TYPE_ENTRY(8535, 8535), - CPU_TYPE_ENTRY(8535, 8535_E), - CPU_TYPE_ENTRY(8536, 8536), - CPU_TYPE_ENTRY(8536, 8536_E), - CPU_TYPE_ENTRY(8540, 8540), - CPU_TYPE_ENTRY(8541, 8541), - CPU_TYPE_ENTRY(8541, 8541_E), - CPU_TYPE_ENTRY(8543, 8543), - CPU_TYPE_ENTRY(8543, 8543_E), - CPU_TYPE_ENTRY(8544, 8544), - CPU_TYPE_ENTRY(8544, 8544_E), - CPU_TYPE_ENTRY(8545, 8545), - CPU_TYPE_ENTRY(8545, 8545_E), - CPU_TYPE_ENTRY(8547, 8547_E), - CPU_TYPE_ENTRY(8548, 8548), - CPU_TYPE_ENTRY(8548, 8548_E), - CPU_TYPE_ENTRY(8555, 8555), - CPU_TYPE_ENTRY(8555, 8555_E), - CPU_TYPE_ENTRY(8560, 8560), - CPU_TYPE_ENTRY(8567, 8567), - CPU_TYPE_ENTRY(8567, 8567_E), - CPU_TYPE_ENTRY(8568, 8568), - CPU_TYPE_ENTRY(8568, 8568_E), - CPU_TYPE_ENTRY(8569, 8569), - CPU_TYPE_ENTRY(8569, 8569_E), - CPU_TYPE_ENTRY(8572, 8572), - CPU_TYPE_ENTRY(8572, 8572_E), - CPU_TYPE_ENTRY(P2020, P2020), - CPU_TYPE_ENTRY(P2020, P2020_E), + CPU_TYPE_ENTRY(8533, 8533, 1), + CPU_TYPE_ENTRY(8533, 8533_E, 1), + CPU_TYPE_ENTRY(8535, 8535, 1), + CPU_TYPE_ENTRY(8535, 8535_E, 1), + CPU_TYPE_ENTRY(8536, 8536, 1), + CPU_TYPE_ENTRY(8536, 8536_E, 1), + CPU_TYPE_ENTRY(8540, 8540, 1), + CPU_TYPE_ENTRY(8541, 8541, 1), + CPU_TYPE_ENTRY(8541, 8541_E, 1), + CPU_TYPE_ENTRY(8543, 8543, 1), + CPU_TYPE_ENTRY(8543, 8543_E, 1), + CPU_TYPE_ENTRY(8544, 8544, 1), + CPU_TYPE_ENTRY(8544, 8544_E, 1), + CPU_TYPE_ENTRY(8545, 8545, 1), + CPU_TYPE_ENTRY(8545, 8545_E, 1), + CPU_TYPE_ENTRY(8547, 8547_E, 1), + CPU_TYPE_ENTRY(8548, 8548, 1), + CPU_TYPE_ENTRY(8548, 8548_E, 1), + CPU_TYPE_ENTRY(8555, 8555, 1), + CPU_TYPE_ENTRY(8555, 8555_E, 1), + CPU_TYPE_ENTRY(8560, 8560, 1), + CPU_TYPE_ENTRY(8567, 8567, 1), + CPU_TYPE_ENTRY(8567, 8567_E, 1), + CPU_TYPE_ENTRY(8568, 8568, 1), + CPU_TYPE_ENTRY(8568, 8568_E, 1), + CPU_TYPE_ENTRY(8569, 8569, 1), + CPU_TYPE_ENTRY(8569, 8569_E, 1), + CPU_TYPE_ENTRY(8572, 8572, 2), + CPU_TYPE_ENTRY(8572, 8572_E, 2), + CPU_TYPE_ENTRY(P2020, P2020, 2), + CPU_TYPE_ENTRY(P2020, P2020_E, 2), }; struct cpu_type *identify_cpu(u32 ver) @@ -81,6 +81,26 @@ struct cpu_type *identify_cpu(u32 ver) return NULL; } +int cpu_numcores() { + struct cpu_type *cpu; + cpu = gd->cpu; + return cpu->num_cores; +} + + +int probecpu (void) +{ + uint svr; + uint ver; + + svr = get_svr(); + ver = SVR_SOC_VER(svr); + + gd->cpu = identify_cpu(ver); + + return 0; +} + int checkcpu (void) { sys_info_t sysinfo; @@ -100,22 +120,31 @@ int checkcpu (void) int i; svr = get_svr(); - ver = SVR_SOC_VER(svr); major = SVR_MAJ(svr); #ifdef CONFIG_MPC8536 major &= 0x7; /* the msb of this nibble is a mfg code */ #endif minor = SVR_MIN(svr); -#if (CONFIG_NUM_CPUS > 1) - volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR); - printf("CPU%d: ", pic->whoami); -#else - puts("CPU: "); +#ifndef CONFIG_MP + if (cpu_numcores() > 1) + puts("#############################################\n" + "The system is detected to be MULTICORE,\n" + "but u-boot is built with UNI-CORE\n" + "To enable mutlticore Build set CONFIG_MP\n" + "#############################################\n\n"); #endif - cpu = identify_cpu(ver); - if (cpu) { + if (cpu_numcores() > 1) { + volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR); + printf("CPU%d: ", pic->whoami); + } + else + puts("CPU: "); + + cpu = gd->cpu; + + if (cpu->name) { puts(cpu->name); if (IS_E_PROCESSOR(svr)) @@ -150,7 +179,7 @@ int checkcpu (void) get_sys_info(&sysinfo); puts("Clock Configuration:"); - for (i = 0; i < CONFIG_NUM_CPUS; i++) { + for (i = 0; i < cpu_numcores(); i++) { if (!(i & 3)) printf ("\n "); printf("CPU%d:%-4s MHz, ", diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index 76f02a4..9f1f9d7 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Freescale Semiconductor. + * Copyright (C) 2008-2009 Freescale Semiconductor, Inc. All rights reserved. * * See file CREDITS for list of people who contributed to this * project. @@ -157,7 +157,7 @@ static void pq3_mp_up(unsigned long bootpg) out_be32(&gur->devdisr, devdisr); /* release the hounds */ - up = ((1 << CONFIG_NUM_CPUS) - 1); + up = ((1 << cpu_numcores()) - 1); bpcr = in_be32(&ecm->eebpcr); bpcr |= (up << 24); out_be32(&ecm->eebpcr, bpcr); @@ -167,7 +167,7 @@ static void pq3_mp_up(unsigned long bootpg) /* wait for everyone */ while (timeout) { int i; - for (i = 0; i < CONFIG_NUM_CPUS; i++) { + for (i = 0; i < cpu_numcores(); i++) { if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER]) cpu_up_mask |= (1 << i); }; diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S index fbefc2c..e553079 100644 --- a/cpu/mpc85xx/release.S +++ b/cpu/mpc85xx/release.S @@ -1,3 +1,26 @@ +/* + * Copyright (C) 2008-2009 Freescale Semiconductor, Inc. All rights reserved. + * Kumar Gala <kumar.gala(a)freescale.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + #include <config.h> #include <mpc85xx.h> #include <version.h> @@ -203,7 +226,7 @@ __secondary_start_page: .align L1_CACHE_SHIFT .globl __spin_table __spin_table: - .space CONFIG_NUM_CPUS*ENTRY_SIZE + .space CONFIG_MAX_CPUS*ENTRY_SIZE /* Fill in the empty space. The actual reset vector is * the last word of the page */ diff --git a/cpu/mpc85xx/speed.c b/cpu/mpc85xx/speed.c index 286b6b2..ea7afad 100644 --- a/cpu/mpc85xx/speed.c +++ b/cpu/mpc85xx/speed.c @@ -1,5 +1,5 @@ /* - * Copyright 2004, 2007-2009 Freescale Semiconductor Inc. + * Copyright (C) 2004, 2007-2009 Freescale Semiconductor, Inc. All rights reserved. * (C) Copyright 2003 Motorola Inc. * Xianghua Xiao, (X.Xiao(a)motorola.com) * @@ -51,7 +51,7 @@ void get_sys_info (sys_info_t * sysInfo) /* Divide before multiply to avoid integer * overflow for processor speeds above 2GHz */ half_freqSystemBus = sysInfo->freqSystemBus/2; - for (i = 0; i < CONFIG_NUM_CPUS; i++) { + for (i = 0; i < cpu_numcores(); i++) { e500_ratio = ((gur->porpllsr) >> (i * 8 + 16)) & 0x3f; sysInfo->freqProcessor[i] = e500_ratio * half_freqSystemBus; } diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index bc64286..37fbd3d 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -1,4 +1,5 @@ /* + * Copyright(C) 2009 Freescale Semiconductor, Inc. * Copyright 2006 Freescale Semiconductor * Jeff Brown * Srikanth Srinivasan (srikanth.srinivasan(a)freescale.com) @@ -31,10 +32,12 @@ #include <tsec.h> #include <asm/fsl_law.h> +DECLARE_GLOBAL_DATA_PTR; + struct cpu_type cpu_type_list [] = { - CPU_TYPE_ENTRY(8610, 8610), - CPU_TYPE_ENTRY(8641, 8641), - CPU_TYPE_ENTRY(8641D, 8641D), + CPU_TYPE_ENTRY(8610, 8610, 1), + CPU_TYPE_ENTRY(8641, 8641, 2), + CPU_TYPE_ENTRY(8641D, 8641D, 2), }; struct cpu_type *identify_cpu(u32 ver) @@ -47,6 +50,25 @@ struct cpu_type *identify_cpu(u32 ver) return NULL; } +int probecpu (void) +{ + uint svr; + uint ver; + + svr = get_svr(); + ver = SVR_SOC_VER(svr); + + gd->cpu = identify_cpu(ver); + + return 0; +} + +int cpu_numcores() { + struct cpu_type *cpu; + cpu = gd->cpu; + return cpu->num_cores; +} + /* * Default board reset function */ @@ -66,9 +88,9 @@ checkcpu(void) uint ver; uint major, minor; char buf1[32], buf2[32]; + struct cpu_type *cpu; volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; volatile ccsr_gur_t *gur = &immap->im_gur; - struct cpu_type *cpu; uint msscr0 = mfspr(MSSCR0); svr = get_svr(); @@ -76,10 +98,20 @@ checkcpu(void) major = SVR_MAJ(svr); minor = SVR_MIN(svr); +#ifndef CONFIG_MP + if (cpu_numcores() > 1) + puts("#############################################\n" + "The system is detected to be MULTICORE,\n" + "but u-boot is built with UNI-CORE\n" + "To enable mutlticore Build set CONFIG_MP\n" + "#############################################\n\n"); +#endif + puts("CPU: "); - cpu = identify_cpu(ver); - if (cpu) { + cpu = gd->cpu; + + if (cpu->name) { puts(cpu->name); } else { puts("Unknown"); diff --git a/cpu/mpc86xx/cpu_init.c b/cpu/mpc86xx/cpu_init.c index 341e815..c8b499c 100644 --- a/cpu/mpc86xx/cpu_init.c +++ b/cpu/mpc86xx/cpu_init.c @@ -129,7 +129,7 @@ void cpu_init_f(void) */ int cpu_init_r(void) { -#if (CONFIG_NUM_CPUS > 1) +#if defined(CONFIG_MP) setup_mp(); #endif return 0; diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h index ca143c7..b799a22 100644 --- a/include/asm-ppc/config.h +++ b/include/asm-ppc/config.h @@ -37,4 +37,45 @@ #endif #endif +#if defined(CONFIG_MPC8533) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8535) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8536) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8540) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8541) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8543) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8544) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8545) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8547) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8548) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8555) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8560) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8567) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8568) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8569) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8572) +#define CONFIG_MAX_CPUS 2 +#elif defined(CONFIG_P2020) +#define CONFIG_MAX_CPUS 2 + +#elif defined(CONFIG_MPC8610) +#define CONFIG_MAX_CPUS 1 +#elif defined(CONFIG_MPC8641) +#define CONFIG_MAX_CPUS 2 +#endif + #endif /* _ASM_CONFIG_H_ */ diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index 244c161..aa531b9 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -1,4 +1,5 @@ /* + * Copyright (C) 2009 Freescale Semiconductor, Inc. All rights reserved. * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * @@ -92,6 +93,9 @@ typedef struct global_data { #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) u32 lbc_clk; #endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */ +#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) + void *cpu; +#endif #if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) u32 i2c1_clk; u32 i2c2_clk; diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 65546ad..a060697 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -1017,13 +1017,14 @@ n: struct cpu_type { char name[15]; u32 soc_ver; + u32 num_cores; }; struct cpu_type *identify_cpu(u32 ver); #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) -#define CPU_TYPE_ENTRY(n, v) \ - { .name = #n, .soc_ver = SVR_##v, } +#define CPU_TYPE_ENTRY(n, v, nc) \ + { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), } #else #if defined(CONFIG_MPC83xx) #define CPU_TYPE_ENTRY(x) {#x, SPR_##x} diff --git a/include/common.h b/include/common.h index 6284b8a..ab5b4f8 100644 --- a/include/common.h +++ b/include/common.h @@ -439,6 +439,8 @@ void ppcDWstore(unsigned int *addr, unsigned int *value); #endif /* $(CPU)/cpu.c */ +int cpu_numcores (void); +int probecpu (void); int checkcpu (void); int checkicache (void); int checkdcache (void); diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 6f1b1a4..d542510 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -34,7 +34,6 @@ #define CONFIG_MPC8572 1 #define CONFIG_MPC8572DS 1 #define CONFIG_MP 1 /* support multiple processors */ -#define CONFIG_NUM_CPUS 2 /* Number of CPUs in the system */ #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 1091043..45932ef 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -17,7 +17,6 @@ #define CONFIG_MPC86xx 1 /* MPC86xx */ #define CONFIG_MPC8610 1 /* MPC8610 specific */ #define CONFIG_MPC8610HPCD 1 /* MPC8610HPCD board specific */ -#define CONFIG_NUM_CPUS 1 /* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 035874b..a878850 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -37,7 +37,6 @@ #define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_MPC8641HPCN 1 /* MPC8641HPCN board specific */ #define CONFIG_MP 1 /* support multiple processors */ -#define CONFIG_NUM_CPUS 2 /* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ /*#define CONFIG_PHYS_64BIT 1*/ /* Place devices in 36-bit space */ #define CONFIG_ADDR_MAP 1 /* Use addr map */ diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index 9306860..0d2475a 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -34,7 +34,6 @@ #define CONFIG_P2020 1 #define CONFIG_P2020DS 1 #define CONFIG_MP 1 /* support multiple processors */ -#define CONFIG_NUM_CPUS 2 /* Number of CPUs in the system */ #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ diff --git a/include/configs/XPEDITE5170.h b/include/configs/XPEDITE5170.h index 2553293..a572fd0 100644 --- a/include/configs/XPEDITE5170.h +++ b/include/configs/XPEDITE5170.h @@ -34,7 +34,6 @@ #define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_XPEDITE5140 1 /* MPC8641HPCN board specific */ #define CONFIG_SYS_BOARD_NAME "XPedite5170" -#define CONFIG_NUM_CPUS 1 /* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_RELOC_FIXUP_WORKS /* Fully relocate to SDRAM */ diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h index 536e063..422dab3 100644 --- a/include/configs/XPEDITE5370.h +++ b/include/configs/XPEDITE5370.h @@ -36,7 +36,6 @@ #define CONFIG_MPC8572 1 #define CONFIG_XPEDITE5370 1 #define CONFIG_SYS_BOARD_NAME "XPedite5370" -#define CONFIG_NUM_CPUS 2 /* 2 Cores */ #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ #define CONFIG_RELOC_FIXUP_WORKS /* Fully relocate to SDRAM */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index ef0f627..5376e4a 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -41,7 +41,6 @@ #define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_SBC8641D 1 /* SBC8641D board specific */ #define CONFIG_MP 1 /* support multiple processors */ -#define CONFIG_NUM_CPUS 2 /* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */ #ifdef RUN_DIAG diff --git a/include/e500.h b/include/e500.h index 84b580d..f8c8266 100644 --- a/include/e500.h +++ b/include/e500.h @@ -8,13 +8,9 @@ #ifndef __ASSEMBLY__ -#ifndef CONFIG_NUM_CPUS -#define CONFIG_NUM_CPUS 1 -#endif - typedef struct { - unsigned long freqProcessor[CONFIG_NUM_CPUS]; + unsigned long freqProcessor[CONFIG_MAX_CPUS]; unsigned long freqSystemBus; unsigned long freqDDRBus; unsigned long freqLocalBus; diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 155171d..70dfe95 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -291,6 +291,10 @@ init_fnc_t *init_sequence[] = { board_early_init_f, #endif +#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) + probecpu, +#endif + #if !defined(CONFIG_8xx_CPUCLK_DEFAULT) get_clocks, /* get CPU and bus clocks (etc.) */ #if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \ diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 0d702bf..dd1fcf1 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -170,7 +170,7 @@ void arch_lmb_reserve(struct lmb *lmb) static void boot_prep_linux(void) { -#if (CONFIG_NUM_CPUS > 1) +#ifdef CONFIG_MP /* if we are MP make sure to flush the dcache() to any changes are made * visibile to all other cores */ flush_dcache(); -- 1.5.6.5

6 9

[U-Boot] [RFC 2/3] uboot-doc: Add example support for uboot-doc
by John Schmoller 28 Jul '09

28 Jul '09

Add support to a small subset of commands, environment variables, and POSTs. These are meant to show the syntax and capabilities of the uboot-doc parser. Signed-off-by: John Schmoller <jschmoller(a)xes-inc.com> --- common/cmd_i2c.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++- common/cmd_mem.c | 45 +++++++++++++++++++++++++++++++- common/cmd_net.c | 30 ++++++++++++++++++++- common/env_common.c | 35 +++++++++++++++++++++++++ post/tests.c | 16 +++++++++++ 5 files changed, 192 insertions(+), 5 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 8f0fc9e..14d394c 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1297,7 +1297,70 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } /***************************************************/ - +/** + * @cmd: i2c speed + * @sect: I2C + * @param[or]: speed - target I2C bus speed + * @desc: Show or set I2C bus speed + */ +/** + * @cmd: i2c dev + * @sect: I2C + * @param[or]: dev - I2C device to make current + * @desc: Show or set current I2C bus + */ +/** + * @cmd: i2c md + * @sect: I2C + * @param: chip - I2C address of desired device + * @param: address[.0, .1, .2] - Address into I2C device + * @param[or]: # of objects - Numer of bytes to read + * @desc: Read from I2C device + */ +/** + * @cmd: i2c mm + * @sect: I2C + * @param: chip - I2C address of desired device + * @param: address[.0, .1, .2] - Address into I2C device + * @desc: Write to I2C device (auto-incrementing) + */ +/** + * @cmd: i2c mw + * @sect: I2C + * @param: chip - I2C address of desired device + * @param: address[.0, .1, .2] - Address into I2C device + * @param: value - Value to write to I2C address + * @param[or]: count - Number of bytes to write + * @desc: Write to I2C device (fill) + */ +/** + * @cmd: i2c nm + * @sect: I2C + * @param: chip - I2C address of desired device + * @param: address[.0, .1, .2] - Address into I2C device + * @desc: Write to I2C device (constant address) + */ +/** + * @cmd: i2c crc32 + * @sect: I2C + * @param: chip - I2C address of desired device + * @param: address[.0, .1, .2] - Address into I2C device + * @param: count - Number of bytes to CRC + * @desc: Computes the CRC32 checksum of an address range + */ +/** + * @cmd: i2c probe + * @sect: I2C + * @desc: Shows all the devices on the I2C bus + */ +/** + * @cmd: i2c loop + * @sect: I2C + * @param: chip - I2C address of desired device + * @param: address[.0, .1, .2] - Address into I2C device + * @param: # of objects - Number of bytes to loop over + * @desc: Looping read of device. Never returns. + */ U_BOOT_CMD( i2c, 6, 1, do_i2c, "I2C sub-system", @@ -1317,6 +1380,12 @@ U_BOOT_CMD( "i2c reset - re-init the I2C Controller\n" "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device" #if defined(CONFIG_CMD_SDRAM) +/** + * @cmd: isdram + * @sect: I2C + * @param: chip - I2C address of desired device + * @desc: Prints SDRAM configuration information + */ "\n" "i2c sdram chip - print SDRAM configuration information" #endif diff --git a/common/cmd_mem.c b/common/cmd_mem.c index cdf8c79..2276a1a 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1169,20 +1169,61 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /**************************************************/ +/** + * @cmd: md + * @sect: Memory + * @param[or]: address - memory location to display + * @param[or]: objs - Number of objects to display + * @desc: The md command displays memory contents both as hexadecimal and + * ASCII data. The last displayed memory address and the value of the + * count argument are remembered, so when you enter md again without + * arguments it will automatically continue at the next address, and use + * the same count again. + * + * If invoked as md or md.l, data is displayed as 32-bit long words. If + * invoked as md.w or md.b instead, 16-bit words or 8-bit bytes are used, + * respectively. + */ U_BOOT_CMD( md, 3, 1, do_mem_md, "memory display", "[.b, .w, .l] address [# of objects]" ); - +/** + * @cmd: mm + * @sect: Memory + * @param[or]: address - memory location to modify + * @desc: The mm command is a method to interactively modify memory contents. + * It will display the address and current contents and then prompt for + * user input. If you enter a legal hexadecimal number, this new value + * will be written to the address. Then, the next address will be + * prompted. If you don't enter any value and just press ENTER, then the + * contents of this address will remain unchanged. The command stops as + * soon as you enter any data that is not a hex number. + * + * If invoked as mm or mm.l, data is displayed as 32-bit long words. If + * invoked as mm.w or mm.b instead, 16-bit words or 8-bit bytes are used, + * respectively. + */ U_BOOT_CMD( mm, 2, 1, do_mem_mm, "memory modify (auto-incrementing address)", "[.b, .w, .l] address" ); - +/** + * @cmd: nm + * @sect: Memory + * @param[or]: address - memory location to modify + * @desc: The nm command (non-incrementing memory modify) can be used to + * interactively write different data several times to the same address. + * This can be useful, for instance, to access and modify device registers. + * + * If invoked as nm or nm.l, data is modified as a 32-bit long word. If + * invoked as nm.w or nm.b instead, 16-bit words or 8-bit bytes are used, + * respectively. + */ U_BOOT_CMD( nm, 2, 1, do_mem_nm, "memory modify (constant address)", diff --git a/common/cmd_net.c b/common/cmd_net.c index 88f4e5b..7760230 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -47,7 +47,24 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { return netboot_common (TFTP, cmdtp, argc, argv); } - +/** + * @cmd: tftpboot + * @sect: Networking + * @param[r]: loadAddress - address to store downloaded file + * @param[or]: [hostIPaddr:]bootfilename - file to download from specified IP + * @desc: The tftpboot command downloads a file from the + * network using the TFTP protocol. @eipaddr, @eserverip, + * @egatewayip, and @enetmask must be set prior to + * calling tftpboot. + * If loadAddress is specified, the file will be + * downloaded to this address. If not specified, the + * file will be downloaded to the address specified by the + * @eloadaddr environment varaible. A load file can + * either be specified by the bootfilename or by the + * @efileaddr. A host IP address can be specified when + * a bootfilename is specified by prepending it to + * bootfilename (ie XX.XX.XX.XX:file). + */ U_BOOT_CMD( tftpboot, 3, 1, do_tftpb, "boot image via network using TFTP protocol", @@ -265,7 +282,16 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } - +/** + * @cmd: ping + * @sect: Networking + * @param[r]: addr - IP address to send Echo Request packet + * @desc: The ping command checks to see if a specific + * IP address is alive by sending an ICMP Echo + * Request packet. If the device specified by + * addr responds before a timeout occurs, ping + * reports that the board is alive. + */ U_BOOT_CMD( ping, 2, 1, do_ping, "send ICMP ECHO_REQUEST to network host", diff --git a/common/env_common.c b/common/env_common.c index 6be3bb0..e55ebce 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -97,9 +97,23 @@ uchar default_environment[] = { #ifdef CONFIG_ETH5ADDR "eth5addr=" MK_STR(CONFIG_ETH5ADDR) "\0" #endif +#ifdef CONFIG_CMD_NET + /** + * @env: ipaddr + * @sect: Networking + * @desc: IP address of this board + */ +#endif #ifdef CONFIG_IPADDR "ipaddr=" MK_STR(CONFIG_IPADDR) "\0" #endif +#ifdef CONFIG_CMD_NET + /** + * @env: serverip + * @sect: Networking + * @desc: IP address of the server + */ +#endif #ifdef CONFIG_SERVERIP "serverip=" MK_STR(CONFIG_SERVERIP) "\0" #endif @@ -112,9 +126,23 @@ uchar default_environment[] = { #ifdef CONFIG_ROOTPATH "rootpath=" MK_STR(CONFIG_ROOTPATH) "\0" #endif +#ifdef CONFIG_CMD_NET + /** + * @env: gatewayip + * @sect: Networking + * @desc: IP address of the next hop gateway + */ +#endif #ifdef CONFIG_GATEWAYIP "gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0" #endif +#ifdef CONFIG_CMD_NET + /** + * @env: netmask + * @sect: Networking + * @desc: Network mask to reach gateway + */ +#endif #ifdef CONFIG_NETMASK "netmask=" MK_STR(CONFIG_NETMASK) "\0" #endif @@ -124,6 +152,13 @@ uchar default_environment[] = { #ifdef CONFIG_BOOTFILE "bootfile=" MK_STR(CONFIG_BOOTFILE) "\0" #endif +#ifdef CONFIG_CMD_NET + /** + * @env: loadaddr + * @sect: Networking + * @desc: Address in memory to store downloaded files + */ +#endif #ifdef CONFIG_LOADADDR "loadaddr=" MK_STR(CONFIG_LOADADDR) "\0" #endif diff --git a/post/tests.c b/post/tests.c index 3224f00..1bee185 100644 --- a/post/tests.c +++ b/post/tests.c @@ -102,6 +102,14 @@ struct post_test post_list[] = #endif #endif #if CONFIG_POST & CONFIG_SYS_POST_I2C + /** + * @post: I2C Post + * @desc: The I2C POST verifies that a pre-assembled list of devices and + * only those devices respond to an I2C bus scan. This list is assembled + * in the board-specific config file as the board is developed. If a + * device doesn't respond, or a device which is not in the list responds, + * the POST will fail. + */ { "I2C test", "i2c", @@ -126,6 +134,14 @@ struct post_test post_list[] = }, #endif #if CONFIG_POST & CONFIG_SYS_POST_MEMORY + /** + * @post: Memory Post + * @desc:The Memory POST verifies RAM by performing the following tests: + * pattern(zeros, ones, 0x5 checkerboard, 0xa checkerboard), bit-flip + * pattern, address pattern (offset), and address pattern (~offset). + * The POST verifies only small 4Kb regions of RAM around each 1Mb + * boundary. + */ { "Memory test", "memory", -- 1.6.0.4

3 3

[U-Boot] Ask: How speed up read nand flash on lpc3250
by xbl1986 28 Jul '09

28 Jul '09

CPU:LPC3250. Nand:K9F2G8U0A 256M the u-boot boot time now about 8s. the step to read linux kernel less 2M cost more or less 4s!! I want to make it faster~,but don't know how to. I try to change the memcpy function.but it's works not very well. so i want to via the maillist to find some help. thank you~~. --wizard

2 1

[U-Boot] [PATCH] TQM8xx* boards: set larger SMC Rx buffer len
by Wolfgang Denk 28 Jul '09

28 Jul '09

Commit 2b3f12c2 added support for configurable SMC Rx buffer length on 8xx systems. Enable this feature on TQM8xx* based boards. This fixes the problem that pasting text in the middle of a line (i. e. inserting in edit mode) did not work - only the first two characters got inserted, the rest was lost. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- include/configs/FPS850L.h | 4 ++-- include/configs/FPS860L.h | 4 ++-- include/configs/HMI10.h | 4 ++-- include/configs/NSCU.h | 2 ++ include/configs/SM850.h | 8 ++------ include/configs/TK885D.h | 3 ++- include/configs/TQM823L.h | 4 ++-- include/configs/TQM823M.h | 4 ++-- include/configs/TQM850L.h | 4 ++-- include/configs/TQM850M.h | 4 ++-- include/configs/TQM855L.h | 5 ++--- include/configs/TQM855M.h | 5 ++--- include/configs/TQM860L.h | 5 ++--- include/configs/TQM860M.h | 5 ++--- include/configs/TQM862L.h | 5 ++--- include/configs/TQM862M.h | 5 ++--- include/configs/TQM866M.h | 3 ++- include/configs/TQM885D.h | 3 ++- include/configs/virtlab2.h | 4 ++-- 19 files changed, 38 insertions(+), 43 deletions(-) diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index aceecd8..1190656 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -36,9 +36,9 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_FPS850L 1 /* ...on a FingerPrint Sensor */ -#undef CONFIG_8xx_CONS_SMC1 #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index 4a61d7c..73bcccc 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -36,9 +36,9 @@ #define CONFIG_MPC860 1 /* This is a MPC860 CPU */ #define CONFIG_FPS860L 1 /* ...on a FingerPrint Sensor */ -#undef CONFIG_8xx_CONS_SMC1 #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index 6c8e81f..88e1946 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -45,8 +45,8 @@ #endif #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_PS2KBD /* AT-PS/2 Keyboard */ diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 6abd3f1..5dd72ff 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -38,6 +38,8 @@ #define CONFIG_NSCU 1 #define CONFIG_8xx_CONS_SCC1 1 /* Console is on SMC1 */ +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_66MHz 1 /* running at 66 MHz, 1:1 clock */ diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 4c469e3..7266f9a 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -38,15 +38,11 @@ #define CONFIG_MPC850 1 /* This is a MPC850 CPU */ #define CONFIG_SM850 1 /*...on a MPC850 Service Module */ -#undef CONFIG_8xx_CONS_SMC1 /* SMC1 not usable because Ethernet on SCC3 */ #define CONFIG_8xx_CONS_SMC2 1 /* Console is on SMC2 */ -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 -#if 0 -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */ -#else #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#endif #define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */ diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 14ff62c..1e6d9ce 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -48,7 +48,8 @@ /* 'cpuclk' variable with valid value) */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 1f816f3..966beae 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -43,8 +43,8 @@ #endif #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 42dcbfc..cfa693d 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -41,8 +41,8 @@ #endif #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 290e211..dc0498e 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -37,8 +37,8 @@ #define CONFIG_TQM850L 1 /* ...on a TQM8xxL module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 2170df5..cdabc53 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -37,8 +37,8 @@ #define CONFIG_TQM850M 1 /* ...on a TQM8xxM module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 3d7dc42..1255928 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -37,9 +37,8 @@ #define CONFIG_TQM855L 1 /* ...on a TQM8xxL module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 35cfa08..584d40b 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -37,9 +37,8 @@ #define CONFIG_TQM855M 1 /* ...on a TQM8xxM module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 4ac485d..a772a27 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -37,9 +37,8 @@ #define CONFIG_TQM860L 1 /* ...on a TQM8xxL module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 39da0bb..7c34786 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -37,9 +37,8 @@ #define CONFIG_TQM860M 1 /* ...on a TQM8xxM module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 1f79b17..75d2dac 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -40,9 +40,8 @@ #define CONFIG_TQM862L 1 /* ...on a TQM8xxL module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 86d5b01..0c7aacd 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -40,9 +40,8 @@ #define CONFIG_TQM862M 1 /* ...on a TQM8xxM module */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 04f538c..071afd4 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -51,7 +51,8 @@ #endif #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 4c80bad..d435819 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -47,7 +47,8 @@ /* 'cpuclk' variable with valid value) */ #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ - +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index 9ebafcc..f7813a1 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -38,8 +38,8 @@ #define CONFIG_TQM8xxL 1 #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ -#undef CONFIG_8xx_CONS_SMC2 -#undef CONFIG_8xx_CONS_NONE +#define CONFIG_SYS_SMC_RXBUFLEN 128 +#define CONFIG_SYS_MAXIDLE 10 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */ #define CONFIG_BOOTCOUNT_LIMIT -- 1.6.0.6

1 0

[U-Boot] oob bytes in NAND
by Muralitharan.Perumal＠pace.com 28 Jul '09

28 Jul '09

Hi, Can I modify the oob bytes in NAND using U-boot commands like this: "nand write.oob 0x8000000 0x0 64" [This should modify the oob bytes of page 0]. Is this Correct? Please can you suggest on this? I tried this but no success. Best Regards Murali This E-mail and any attachments hereto are strictly confidential and intended solely for the addressee. If you are not the intended addressee please notify the sender by return and delete the message. You must not disclose, forward or copy this E-mail or attachments to any third party without the prior consent of the sender. Pace plc is registered in England and Wales (Company no. 1672847) and our Registered Office is at Victoria Road, Saltaire, West Yorkshire, BD18 3LF, UK. Tel +44 (0) 1274 532000 Fax +44 (0) 1274 532010. <http://www.pace.com> Save where otherwise agreed in writing between you and Pace (i) all orders for goods and/or services placed by you are made pursuant to Pace's standard terms and conditions of sale which may have been provided to you, or in any event are available at http://www.pace.com/uktcsale.pdf (ii) all orders for goods and/or services placed by Pace are subject to Pace's standard terms and conditions of purchase which may have been provided to you, or in any event are available at http://www.pace.com/uktcpurch.pdf. All other inconsistent terms in any other documentation including without limitation any purchase order, reschedule instruction, order acknowledgement, delivery note or invoice are hereby excluded. This message has been scanned for viruses by BlackSpider MailControl - www.blackspider.com

2 1

[U-Boot] [PATCH] Fix ext2load return code
by Wolfgang Denk 28 Jul '09

28 Jul '09

Make the ext2load command return 0 on success (instead of the file length). Also fix output format (get rid of randoim newlines) and some coding style issues (long lines etc.). Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- common/cmd_ext2.c | 74 +++++++++++++++++++++++++++------------------------- 1 files changed, 38 insertions(+), 36 deletions(-) diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index 6ee60c6..b7e4048 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -67,51 +67,50 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argc < 3) { cmd_usage(cmdtp); - return(1); + return 1; } dev = (int)simple_strtoul (argv[2], &ep, 16); dev_desc = get_dev(argv[1],dev); if (dev_desc == NULL) { printf ("\n** Block device %s %d not supported\n", argv[1], dev); - return(1); + return 1; } if (*ep) { if (*ep != ':') { puts ("\n** Invalid boot device, use `dev[:part]' **\n"); - return(1); + return 1; } part = (int)simple_strtoul(++ep, NULL, 16); } - if (argc == 4) { - filename = argv[3]; - } + if (argc == 4) + filename = argv[3]; PRINTF("Using device %s %d:%d, directory: %s\n", argv[1], dev, part, filename); if ((part_length = ext2fs_set_blk_dev(dev_desc, part)) == 0) { printf ("** Bad partition - %s %d:%d **\n", argv[1], dev, part); ext2fs_close(); - return(1); + return 1; } if (!ext2fs_mount(part_length)) { printf ("** Bad ext2 partition or disk - %s %d:%d **\n", argv[1], dev, part); ext2fs_close(); - return(1); + return 1; } if (ext2fs_ls (filename)) { printf ("** Error ext2fs_ls() **\n"); ext2fs_close(); - return(1); + return 1; }; ext2fs_close(); - return(0); + return 0; } U_BOOT_CMD( @@ -140,11 +139,11 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 3: addr_str = getenv("loadaddr"); - if (addr_str != NULL) { + if (addr_str != NULL) addr = simple_strtoul (addr_str, NULL, 16); - } else { + else addr = CONFIG_SYS_LOAD_ADDR; - } + filename = getenv ("bootfile"); count = 0; break; @@ -166,24 +165,24 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) default: cmd_usage(cmdtp); - return(1); + return 1; } if (!filename) { - puts ("\n** No boot file defined **\n"); - return(1); + puts ("** No boot file defined **\n"); + return 1; } dev = (int)simple_strtoul (argv[2], &ep, 16); dev_desc = get_dev(argv[1],dev); if (dev_desc==NULL) { - printf ("\n** Block device %s %d not supported\n", argv[1], dev); - return(1); + printf ("** Block device %s %d not supported\n", argv[1], dev); + return 1; } if (*ep) { if (*ep != ':') { - puts ("\n** Invalid boot device, use `dev[:part]' **\n"); - return(1); + puts ("** Invalid boot device, use `dev[:part]' **\n"); + return 1; } part = (int)simple_strtoul(++ep, NULL, 16); } @@ -193,50 +192,53 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (part != 0) { if (get_partition_info (dev_desc, part, &info)) { printf ("** Bad partition %d **\n", part); - return(1); + return 1; } if (strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) { - printf ("\n** Invalid partition type \"%.32s\"" + printf ("** Invalid partition type \"%.32s\"" " (expect \"" BOOT_PART_TYPE "\")\n", info.type); - return(1); + return 1; } - PRINTF ("\nLoading from block device %s device %d, partition %d: " - "Name: %.32s Type: %.32s File:%s\n", - argv[1], dev, part, info.name, info.type, filename); + printf ("Loading file \"%s\" " + "from %s device %d:%d (%.32s)\n", + filename, + argv[1], dev, part, info.name); } else { - PRINTF ("\nLoading from block device %s device %d, File:%s\n", - argv[1], dev, filename); + printf ("Loading file \"%s\" from %s device %d\n", + filename, argv[1], dev); } if ((part_length = ext2fs_set_blk_dev(dev_desc, part)) == 0) { printf ("** Bad partition - %s %d:%d **\n", argv[1], dev, part); ext2fs_close(); - return(1); + return 1; } if (!ext2fs_mount(part_length)) { - printf ("** Bad ext2 partition or disk - %s %d:%d **\n", argv[1], dev, part); + printf ("** Bad ext2 partition or disk - %s %d:%d **\n", + argv[1], dev, part); ext2fs_close(); - return(1); + return 1; } filelen = ext2fs_open(filename); if (filelen < 0) { printf("** File not found %s\n", filename); ext2fs_close(); - return(1); + return 1; } if ((count < filelen) && (count != 0)) { filelen = count; } if (ext2fs_read((char *)addr, filelen) != filelen) { - printf("\n** Unable to read \"%s\" from %s %d:%d **\n", filename, argv[1], dev, part); + printf("** Unable to read \"%s\" from %s %d:%d **\n", + filename, argv[1], dev, part); ext2fs_close(); - return(1); + return 1; } ext2fs_close(); @@ -244,11 +246,11 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* Loading ok, update default load address */ load_addr = addr; - printf ("\n%d bytes read\n", filelen); + printf ("%d bytes read\n", filelen); sprintf(buf, "%X", filelen); setenv("filesize", buf); - return(filelen); + return 0; } U_BOOT_CMD( -- 1.6.0.6

1 0

[U-Boot] [PATCH] fix ext2 inode size and calculations
by Weirich, Bernhard 28 Jul '09

28 Jul '09

Fixed some indentations since patch from 2009-06-09. Hope this is good now, anyway the whole ext2fs.c file does not conform to coding style guidelines, so maybe someone wants to run Lindent on it...? Regards, Bernhard From: unsik Kim <donari75(a)gmail.com> Signed-off-by: unsik Kim <donari75(a)gmail.com> Signed-off-by: Bernhard Weirich <bernhard.weirich(a)riedel.net> --- fs/ext2/ext2fs.c 2009-06-10 13:34:37.000000000 +0200 +++ fs/ext2/ext2fs.c 2009-06-10 13:52:05.000000000 +0200 @@ -110,7 +110,7 @@ uint32_t inode_table_id; uint16_t free_blocks; uint16_t free_inodes; - uint16_t pad; + uint16_t used_dir_cnt; uint32_t reserved[3]; }; @@ -182,14 +182,22 @@ static int ext2fs_blockgroup (struct ext2_data *data, int group, struct ext2_block_group *blkgrp) { + unsigned int blkno; + unsigned int blkoff; + unsigned int desc_per_blk; + + desc_per_blk = EXT2_BLOCK_SIZE(data) / sizeof(struct ext2_block_group); + + blkno = __le32_to_cpu(data->sblock.first_data_block) + 1 + + group / desc_per_blk; + blkoff = (group % desc_per_blk) * sizeof(struct ext2_block_group); #ifdef DEBUG - printf ("ext2fs read blockgroup\n"); + printf ("ext2fs read %d group descriptor (blkno %d blkoff %d)\n", + group, blkno, blkoff); #endif - return (ext2fs_devread - (((__le32_to_cpu (data->sblock.first_data_block) + - 1) << LOG2_EXT2_BLOCK_SIZE (data)), - group * sizeof (struct ext2_block_group), - sizeof (struct ext2_block_group), (char *) blkgrp)); + return (ext2fs_devread (blkno << LOG2_EXT2_BLOCK_SIZE(data), + blkoff, sizeof(struct ext2_block_group), (char *)blkgrp)); + } @@ -203,34 +211,37 @@ unsigned int blkno; unsigned int blkoff; - /* It is easier to calculate if the first inode is 0. */ - ino--; #ifdef DEBUG printf ("ext2fs read inode %d\n", ino); #endif - status = ext2fs_blockgroup (data, - ino / - __le32_to_cpu (sblock->inodes_per_group), - &blkgrp); + /* It is easier to calculate if the first inode is 0. */ + ino--; + status = ext2fs_blockgroup (data, ino / __le32_to_cpu + (sblock->inodes_per_group), &blkgrp); if (status == 0) { return (0); } - inodes_per_block = EXT2_BLOCK_SIZE (data) / 128; - blkno = (ino % __le32_to_cpu (sblock->inodes_per_group)) / - inodes_per_block; - blkoff = (ino % __le32_to_cpu (sblock->inodes_per_group)) % - inodes_per_block; + + inodes_per_block = EXT2_BLOCK_SIZE(data) / __le16_to_cpu(sblock->inode_size); + +#ifdef DEBUG + printf ("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff); +#endif + + blkno = __le32_to_cpu (blkgrp.inode_table_id) + + (ino % __le32_to_cpu (sblock->inodes_per_group)) + / inodes_per_block; + blkoff = (ino % inodes_per_block) * __le16_to_cpu (sblock->inode_size); #ifdef DEBUG printf ("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff); #endif /* Read the inode. */ - status = ext2fs_devread (((__le32_to_cpu (blkgrp.inode_table_id) + - blkno) << LOG2_EXT2_BLOCK_SIZE (data)), - sizeof (struct ext2_inode) * blkoff, + status = ext2fs_devread (blkno << LOG2_EXT2_BLOCK_SIZE (data), blkoff, sizeof (struct ext2_inode), (char *) inode); if (status == 0) { return (0); } + return (1); }

2 1

[U-Boot] [PATCH] Fix boards broken after removal of legacy NAND and DoC support
by Wolfgang Denk 28 Jul '09

28 Jul '09

Commit 2419169f removed support for legacy NAND and disk on chip but missed to update the code for a few boards. This patch fixes the resulting build issues. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/bmw/bmw.c | 2 ++ board/pcippc2/pcippc2.c | 2 ++ board/rbc823/rbc823.c | 2 ++ include/configs/NETPHONE.h | 1 - include/configs/NETTA.h | 1 - include/configs/NETTA2.h | 1 - include/configs/NETVIA.h | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c index 870011e..4039145 100644 --- a/board/bmw/bmw.c +++ b/board/bmw/bmw.c @@ -117,6 +117,7 @@ sys_led_msg(char* msg) LED_REG(3) = msg[0]; } +#ifdef CONFIG_CMD_DOC /* * Map onboard TSOP-16MB DOC FLASH chip. */ @@ -124,6 +125,7 @@ void doc_init (void) { doc_probe(DOC_BASE_ADDR); } +#endif #define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR) diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c index 7985f7d..6ee44d6 100644 --- a/board/pcippc2/pcippc2.c +++ b/board/pcippc2/pcippc2.c @@ -147,10 +147,12 @@ void pci_init_board (void) cpc710_pci_enable_timeout (); } +#ifdef CONFIG_CMD_DOC void doc_init (void) { doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC); } +#endif void pcippc2_cpci3264_init (void) { diff --git a/board/rbc823/rbc823.c b/board/rbc823/rbc823.c index b294906..e10d9f9 100644 --- a/board/rbc823/rbc823.c +++ b/board/rbc823/rbc823.c @@ -256,6 +256,7 @@ static long int dram_size (long int mamr_value, long int *base, return (get_ram_size (base, maxsize)); } +#ifdef CONFIG_CMD_DOC void doc_init (void) { volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; @@ -267,3 +268,4 @@ void doc_init (void) doc_probe (FLASH_BASE1_PRELIM); } +#endif diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index 8a197ad..76ca916 100644 --- a/include/configs/NETPHONE.h +++ b/include/configs/NETPHONE.h @@ -120,7 +120,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_NAND #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_MII diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index dda6179..4f9f9fe 100644 --- a/include/configs/NETTA.h +++ b/include/configs/NETTA.h @@ -134,7 +134,6 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MII -#define CONFIG_CMD_NAND #define CONFIG_CMD_NFS #define CONFIG_CMD_PCMCIA #define CONFIG_CMD_PING diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index 167285e..d060cb7 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -121,7 +121,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_NAND #define CONFIG_CMD_DHCP #define CONFIG_CMD_PING #define CONFIG_CMD_MII diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h index b9cf621..a18b480 100644 --- a/include/configs/NETVIA.h +++ b/include/configs/NETVIA.h @@ -107,7 +107,7 @@ #define CONFIG_CMD_PING #if defined(CONFIG_NETVIA_VERSION) && CONFIG_NETVIA_VERSION >= 2 -#define CONFIG_CMD_NAND +/* #define CONFIG_CMD_NAND */ /* disabled */ #endif -- 1.6.0.6

2 2