January 2009 - U-Boot

[U-Boot] [PATCH 01/31] powerpc: 8xx serial: add configurable SMC Rx buffer len
by Heiko Schocher 28 Jan '09

28 Jan '09

This patch adds the configuration option CONFIG_SYS_SMC_RXBUFLEN. With this option it is possible to allow the receive buffer for the SMC on 8xx to be greater then 1. In case CONFIG_SYS_SMC_RXBUFLEN == 1 or it is not defined this driver works as the old version. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- cpu/mpc8xx/serial.c | 102 +++++++++++++++++++++++++++++----------------- include/configs/mgsuvd.h | 1 + 2 files changed, 65 insertions(+), 38 deletions(-) diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c index bd90dcd..cb8c2e5 100644 --- a/cpu/mpc8xx/serial.c +++ b/cpu/mpc8xx/serial.c @@ -65,6 +65,18 @@ DECLARE_GLOBAL_DATA_PTR; #endif /* CONFIG_8xx_CONS_SCCx */ +typedef volatile struct serialbuffer { + cbd_t rxbd; /* Rx BD */ + cbd_t txbd; /* Tx BD */ +#ifdef CONFIG_SYS_SMC_RXBUFLEN + uint rxindex; /* index for next character to read */ + volatile uchar rxbuf[CONFIG_SYS_SMC_RXBUFLEN];/* rx buffers */ +#else + volatile uchar rxbuf[1]; /* rx buffers */ +#endif + volatile uchar txbuf; /* tx buffers */ +} serialbuffer_t; + static void serial_setdivisor(volatile cpm8xx_t *cp) { int divisor=(gd->cpu_clk + 8*gd->baudrate)/16/gd->baudrate; @@ -113,12 +125,12 @@ static int smc_init (void) volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile smc_t *sp; volatile smc_uart_t *up; - volatile cbd_t *tbdf, *rbdf; volatile cpm8xx_t *cp = &(im->im_cpm); #if (!defined(CONFIG_8xx_CONS_SMC1)) && (defined(CONFIG_MPC823) || defined(CONFIG_MPC850)) volatile iop8xx_t *ip = (iop8xx_t *)&(im->im_ioport); #endif uint dpaddr; + volatile serialbuffer_t *rtx; /* initialize pointers to SMC */ @@ -194,23 +206,26 @@ static int smc_init (void) */ #ifdef CONFIG_SYS_ALLOC_DPRAM - dpaddr = dpram_alloc_align (sizeof(cbd_t)*2 + 2, 8) ; + /* allocate + * size of struct serialbuffer with bd rx/tx, buffer rx/tx and rx index + */ + dpaddr = dpram_alloc_align((sizeof(serialbuffer_t)), 8); #else dpaddr = CPM_SERIAL_BASE ; #endif + rtx = (serialbuffer_t *)&cp->cp_dpmem[dpaddr]; /* Allocate space for two buffer descriptors in the DP ram. * For now, this address seems OK, but it may have to * change with newer versions of the firmware. * damm: allocating space after the two buffers for rx/tx data */ - rbdf = (cbd_t *)&cp->cp_dpmem[dpaddr]; - rbdf->cbd_bufaddr = (uint) (rbdf+2); - rbdf->cbd_sc = 0; - tbdf = rbdf + 1; - tbdf->cbd_bufaddr = ((uint) (rbdf+2)) + 1; - tbdf->cbd_sc = 0; + rtx->rxbd.cbd_bufaddr = (uint) &rtx->rxbuf; + rtx->rxbd.cbd_sc = 0; + + rtx->txbd.cbd_bufaddr = (uint) &rtx->txbuf; + rtx->txbd.cbd_sc = 0; /* Set up the uart parameters in the parameter ram. */ @@ -256,13 +271,21 @@ static int smc_init (void) /* Make the first buffer the only buffer. */ - tbdf->cbd_sc |= BD_SC_WRAP; - rbdf->cbd_sc |= BD_SC_EMPTY | BD_SC_WRAP; + rtx->txbd.cbd_sc |= BD_SC_WRAP; + rtx->rxbd.cbd_sc |= BD_SC_EMPTY | BD_SC_WRAP; +#ifdef CONFIG_SYS_SMC_RXBUFLEN + /* multi-character receive. + */ + up->smc_mrblr = CONFIG_SYS_SMC_RXBUFLEN; + up->smc_maxidl = 10; + rtx->rxindex = 0; +#else /* Single character receive. */ up->smc_mrblr = 1; up->smc_maxidl = 0; +#endif /* Initialize Tx/Rx parameters. */ @@ -285,11 +308,10 @@ static int smc_init (void) static void smc_putc(const char c) { - volatile cbd_t *tbdf; - volatile char *buf; volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile cpm8xx_t *cpmp = &(im->im_cpm); + volatile serialbuffer_t *rtx; #ifdef CONFIG_MODEM_SUPPORT if (gd->be_quiet) @@ -300,23 +322,18 @@ smc_putc(const char c) smc_putc ('\r'); up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC]; -#ifdef CONFIG_SYS_SMC_UCODE_PATCH - up = (smc_uart_t *) &cpmp->cp_dpmem[up->smc_rpbase]; -#endif + #ifdef CONFIG_SYS_SMC_UCODE_PATCH + up = (smc_uart_t *)&cpmp->cp_dpmem[up->smc_rpbase]; + #endif - tbdf = (cbd_t *)&cpmp->cp_dpmem[up->smc_tbase]; + rtx = (serialbuffer_t *)&cpmp->cp_dpmem[up->smc_rbase]; - /* Wait for last character to go. - */ - - buf = (char *)tbdf->cbd_bufaddr; - - *buf = c; - tbdf->cbd_datlen = 1; - tbdf->cbd_sc |= BD_SC_READY; + rtx->txbuf = c; + rtx->txbd.cbd_datlen = 1; + rtx->txbd.cbd_sc |= BD_SC_READY; __asm__("eieio"); - while (tbdf->cbd_sc & BD_SC_READY) { + while (rtx->txbd.cbd_sc & BD_SC_READY) { WATCHDOG_RESET (); __asm__("eieio"); } @@ -333,49 +350,58 @@ smc_puts (const char *s) static int smc_getc(void) { - volatile cbd_t *rbdf; - volatile unsigned char *buf; volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile cpm8xx_t *cpmp = &(im->im_cpm); - unsigned char c; + volatile serialbuffer_t *rtx; + unsigned char c; up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC]; #ifdef CONFIG_SYS_SMC_UCODE_PATCH up = (smc_uart_t *) &cpmp->cp_dpmem[up->smc_rpbase]; #endif - - rbdf = (cbd_t *)&cpmp->cp_dpmem[up->smc_rbase]; + rtx = (serialbuffer_t *)&cpmp->cp_dpmem[up->smc_rbase]; /* Wait for character to show up. */ - buf = (unsigned char *)rbdf->cbd_bufaddr; - - while (rbdf->cbd_sc & BD_SC_EMPTY) + while (rtx->rxbd.cbd_sc & BD_SC_EMPTY) WATCHDOG_RESET (); - c = *buf; - rbdf->cbd_sc |= BD_SC_EMPTY; +#ifdef CONFIG_SYS_SMC_RXBUFLEN + /* the characters are read one by one, + * use the rxindex to know the next char to deliver + */ + c = *(unsigned char *) (rtx->rxbd.cbd_bufaddr+rtx->rxindex); + rtx->rxindex++; + /* check if all char are readout, then make prepare for next receive */ + if (rtx->rxindex >= rtx->rxbd.cbd_datlen) { + rtx->rxindex = 0; + rtx->rxbd.cbd_sc |= BD_SC_EMPTY; + } +#else + c = *(unsigned char *) (rtx->rxbd.cbd_bufaddr); + rtx->rxbd.cbd_sc |= BD_SC_EMPTY; +#endif return(c); } static int smc_tstc(void) { - volatile cbd_t *rbdf; volatile smc_uart_t *up; volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR; volatile cpm8xx_t *cpmp = &(im->im_cpm); + volatile serialbuffer_t *rtx; up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC]; #ifdef CONFIG_SYS_SMC_UCODE_PATCH up = (smc_uart_t *) &cpmp->cp_dpmem[up->smc_rpbase]; #endif - rbdf = (cbd_t *)&cpmp->cp_dpmem[up->smc_rbase]; + rtx = (serialbuffer_t *)&cpmp->cp_dpmem[up->smc_rbase]; - return(!(rbdf->cbd_sc & BD_SC_EMPTY)); + return !(rtx->rxbd.cbd_sc & BD_SC_EMPTY); } struct serial_device serial_smc_device = diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index f53b6d3..8f82751 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -44,6 +44,7 @@ #define CONFIG_SYS_SMC_UCODE_PATCH 1 /* Relocate SMC1 */ #define CONFIG_SYS_SMC_DPMEM_OFFSET 0x1fc0 #define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */ +#define CONFIG_SYS_SMC_RXBUFLEN 16 #define CONFIG_SYS_CPM_BOOTCOUNT_ADDR 0x1eb0 /* In case of SMC relocation, the * default value is not working */ -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] [PATCH 00/31] updates for keymile boards
by Heiko Schocher 28 Jan '09

28 Jan '09

following Patch series makes a lot of updates for the existing keymile boards mgsuvd, mgcoge and kmeter1. Also they add a new board from this manufacturer based on a MPC852T. Heiko Schocher (31): powerpc: 8xx serial: add configurable SMC Rx buffer len environment, netconsole: reducing packages when printing environment variables netloop: speed up NetLoop powerpc: 82xx serial: add configurable SMC Rx buffer len powerpc: extract common config options for keymile boards. mpc82xx, mgcoge: add CS4 on mgcoge mpc83xx kmeter1: change some register settings powerpc, keymile boards: added cmdline feature powerpc: mgcoge, mgsuvd: RxBuffer for serial input increased to 128 byte 8xx, mgsuvd: size and position of environment corrected powerpc, mgcoge, mgsuvd: MTD feature activated, partitions set 82xx, mgcoge: corrected wrong flash sizes powerpc: mgcoge, mgsuvd: move IVM feature config to keymile-common.h powerpc: mgcoge, mgsuvd: make some definitions in keymile-common.h conditional powerpc: keymile boards: conditional definition of a private env part dtt: call dtt_init () conditional in init_sequence mpc83xx, i2c: add mux support for fsl_i2c mpc83xx, kmeter1: add I2C, dtt, eeprom support i2c, mpc83xx: add CONFIG_SYS_I2C_INIT_BOARD for fsl_i2c mpc83xx, kmeter1: extract common I2C options in keymile header mpc83xx, kmeter1: autodetect size of DDR II Ram. mpc83xx, kmeter1, mtd: set the default partition table powerpc: mgcoge, mgsuvd, kmeter1: activate pram data area mgcoge, mgsuvd, kmeter1: removed double env params powerpc: mgcoge, mgsuvd, kmeter1: board Id parameters powerpc: mgcoge, mgsuvd, kmeter1: dont print errormsg if second IVM Block lacks.. 8xx, mgsuvd: rename board to a more generic name 8xx: add support for new keymile kmsupx4 board. 8xx, kmsupx4: add bootcount support 8xx, km8xx: update in dts node "flash", the reg value correct. 83xx, kmeter1: added bootcount feature Makefile | 15 ++- board/keymile/common/common.c | 31 +++- board/keymile/{mgsuvd => km8xx}/Makefile | 2 +- board/keymile/{mgsuvd => km8xx}/config.mk | 0 board/keymile/{mgsuvd/mgsuvd.c => km8xx/km8xx.c} | 12 ++- .../mgsuvd_hdlc_enet.c => km8xx/km8xx_hdlc_enet.c} | 0 board/keymile/{mgsuvd => km8xx}/u-boot.lds | 0 board/keymile/kmeter1/kmeter1.c | 63 +++++++-- common/cmd_nvedit.c | 14 ++ cpu/mpc8260/serial_smc.c | 94 ++++++++---- cpu/mpc83xx/cpu.c | 27 ++++ cpu/mpc8xx/cpu_init.c | 2 + cpu/mpc8xx/serial.c | 102 ++++++++----- cpu/mpc8xx/start.S | 3 +- drivers/i2c/fsl_i2c.c | 30 ++++- drivers/i2c/soft_i2c.c | 3 + include/common.h | 1 + include/commproc.h | 2 +- include/configs/keymile-common.h | 162 ++++++++++++++++++-- include/configs/{mgsuvd.h => km8xx.h} | 127 ++++++++------- include/configs/kmeter1.h | 118 ++++++++------- include/configs/mgcoge.h | 98 ++++++------- include/dtt.h | 2 + lib_ppc/board.c | 3 +- net/eth.c | 11 +- net/net.c | 88 ++++++----- 26 files changed, 699 insertions(+), 311 deletions(-) rename board/keymile/{mgsuvd => km8xx}/Makefile (98%) rename board/keymile/{mgsuvd => km8xx}/config.mk (100%) rename board/keymile/{mgsuvd/mgsuvd.c => km8xx/km8xx.c} (95%) rename board/keymile/{mgsuvd/mgsuvd_hdlc_enet.c => km8xx/km8xx_hdlc_enet.c} (100%) rename board/keymile/{mgsuvd => km8xx}/u-boot.lds (100%) rename include/configs/{mgsuvd.h => km8xx.h} (79%) -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] CONFIRM YOUR WINNGIN DETAITS.
by overseacomp 28 Jan '09

28 Jan '09

CONFIRM YOUR WINNGIN DETAITS. We are happy to inform you that you have emerged a winner under the Second Category of our promotion program. Winners were picked by computerized system,drawn from over 25,000,000 companies and individuals e-mail addresses worldwide. This Lotery were held on 24th of Deceber 2008, the result was officially announced 28th of January,2009. Your email ID has won a lump sum of €570.000.00(Five Hundred and Seventy Thousand euros) only in the Second category of our computer ballot prize award. Therefore you do not need to buy ticket to enter for it. CONGRATULATIONS!! NOTE: to file for your claim, please contact the claim department below on phone as well as on email. TRUST SECURITY COMPANING Holland-Netherlands, Reference and Batch number Remember to quote these numbers in your correspondence with your claims agent. Mr.ROB VAN DEVAN. Email:overseacomp@netscape.net Tel:+31-643-860-690 Reference No: NFP/.NL77355 Batch No: PDS/HG87/NP401 Ticket No:HAL/PGM36601 Note: The Validity period of the winnings is for 14 working days hence you are expected to make your claims immediately, any claim not made before this date will be returned to the MINISTERY of ECONOMICS as unclaimed. And also be informed that 1% of your Lotto Winning will be paid to TRUST SECURITY COMPANING, after you have received your money in your Account. Once again Congratulations !!! Best Regards, Mrs Elena Hans Lotto Sec. Holland-Netherlands

1 0

[U-Boot] [PATCH] mpc8536ds.c: include sata.h to for needed function prototypes
by Wolfgang Denk 28 Jan '09

28 Jan '09

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/freescale/mpc8536ds/mpc8536ds.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 1e2e4e6..eb80500 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -37,6 +37,7 @@ #include <fdt_support.h> #include <tsec.h> #include <netdev.h> +#include <sata.h> #include "../common/pixis.h" #include "../common/sgmii_riser.h" -- 1.6.0.6

1 0

Re: [U-Boot] [PATCH] V2 NAND_SPL support for phycore imx31 to Magnus Lilja
by Maxim Artamonov 28 Jan '09

28 Jan '09

Goodday Magnus! In message on Saturday 03 January 2009 03:49:53 Magnus Lilja wrote: > Hi > > I have used your patch to boot the i.MX31 PDK board from its large > page NAND now. I had to modify one function (see below). > > > 2008/12/5 Maxim Artamonov <scn1874(a)yandex.ru>: > > V2 NAND_SPL support for phycore imx31 > > > > Changelog: > > > > * Added bad block verify and skip; > > * Correct code to codestyle; > > * Added few comments; > > diff --git a/nand_spl/nand_boot_mx31.c b/nand_spl/nand_boot_mx31.c > > +static void mx31_nand_data_output(void) > > +{ > > + NFC_CONFIG1 = NFC_ECC_EN; > > + NFC_BUF_ADDR = 0; /* read in first 0 buffer*/ > > + NFC_CONFIG2 = NFC_OUTPUT; > > + mx31_wait_ready(); > > +} > > I suggest using the following function instead in order to support for > small page and large page devices: > > static void mx31_nand_data_output(void) > { > int i; > > /* > * The NAND controller requires four output commands for > * large page devices. > */ > for (i = 0; i < (CFG_NAND_PAGE_SIZE / 512); i++) { > NFC_CONFIG1 = NFC_ECC_EN; > NFC_BUF_ADDR = i; /* read in i:th buffer */ > NFC_CONFIG2 = NFC_OUTPUT; > mx31_wait_ready(); > } > } > Ok, I have'nt possibilities for check this, but I think you have checked this. I'll add you code. > > + mx31_nand_data_output ();/*fill the main buffer 0*/ > > + > > + if (mx31_nand_check_ecc ()) > > + while (1){ > > + break;}; /*!!!!!*/ > > How about returning an error code and letting the nand_boot() function > below just loop forever (or something) if this happens? I'll add infinitive loop for this. Return code of error to ..? > > + > > + p1 = (u32 *)MAIN_AREA0; > > + p2 = (u32 *)buf; > > + > > + /*main copy loop from NAND-buffer to SDRAM memory*/ > > + for (i=0; i < (CFG_NAND_PAGE_SIZE / 4); i++){ > > + *p2 = *p1; > > + p1++; > > + p2++; > > + } > > + > > + p1 = (u32 *)SPARE_AREA0; > > + > > + /*it is hardware specific code for 8-bit 512kB NAND-flash spare area*/ > > I guess "512kB" should be just "512"? > You are right. 512 B. > > + p1++; > > + a = *p1; > > + a = (a & 0x0000ff00) >> 8; > > + > > Is this code valid also for large page NAND devices? I don't know the > answer myself. > No, for 2-k paged Nand it would be better to write something like that: a = *p1; a = (a & 0x000000ff); In addition, there is a difference between 8-bit and 16-bit modes. > I hope you have the possibility to update the patch with the above as > well as Scott's comments. > I'll do. with regards, Maxim

1 0

[U-Boot] [PATCH] NAND jffs2 bug fix - sector size not initialized
by Derek Ou 27 Jan '09

27 Jan '09

NAND jffs2 bug fix - sector size not initialized. Signed-off-by: Derek Ou <dou(a)siconix.com> --- common/cmd_jffs2.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 7866c80..f6966f3 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -1853,6 +1853,8 @@ int mtdparts_init(void) if (part->size == SIZE_REMAINING) part->size = id->size - part->offset; + part->sector_size = nand_info[id->num].erasesize; + DEBUGF("part : name = %s, size = 0x%08lx, offset = 0x%08lx\n", part->name, part->size, part->offset); -- 1.5.4.3

2 1

[U-Boot] SATA/IDE/etc... init
by Mike Frysinger 27 Jan '09

27 Jan '09

the SATA/IDE/etc... layers seem to go against the u-boot policy when it comes to initialization. in other words, if support for them is enabled, then they are unconditionally initialized in board code (see ide_init / sata_initialize in lib_*/board.c:board_init_r). am i missing something or should these init functions be delayed until the sata/ide/whatever functions need them ? or should they be made explicit like some commands where you first have to do "sata init" before you can access the device ? this bugs me most because normally u-boot starts up nice & fast, but now that we've added SATA support, there's an annoying second or 3 pause while the disk is probed ... -mike

5 40

[U-Boot] [PATCH] part_efi: Fix partition size calculation due to inclusive ending LBA.
by Richard Retanubun 27 Jan '09

27 Jan '09

This patch fixed an off-by-one bug found for GPT. Because the ending LBA is inclusive, the partition size should be ((ending_lba + 1) - starting-LBA). This is confirmed against the results from the parted tool. (e.g. use parted /dev/sda -s unit S print) and observe the size. Signed-off-by: Richard Retanubun <RichardRetanubun(a)RuggedCom.com> --- Hi Wolfgang, I sent this patch in december 12 to u-boot(a)lists.denx.de but I don't see it in the mailing list (possibly because I botched the commit message). disk/part_efi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index cc188ee..d8a8111 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -163,7 +163,9 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part, /* The ulong casting limits the maximum disk size to 2 TB */ info->start = (ulong) le64_to_int((*pgpt_pte)[part - 1].starting_lba); - info->size = (ulong) le64_to_int((*pgpt_pte)[part - 1].ending_lba) - info->start; + /* The ending LBA is inclusive, to calculate size, add 1 to it */ + info->size = ((ulong)le64_to_int((*pgpt_pte)[part - 1].ending_lba) + 1) + - info->start; info->blksz = GPT_BLOCK_SIZE; sprintf((char *)info->name, "%s%d\n", GPT_ENTRY_NAME, part); -- 1.5.6.5

2 3

[U-Boot] [PATCH 0/5] Command usage cleanup
by Peter Tyser 27 Jan '09

27 Jan '09

2 6

[U-Boot] nand potential div0
by Ryan J M 27 Jan '09

27 Jan '09

I thought it would be better to check whether chip->ecc.size equal 0 here, I forgot to set ecc.size in board_nand_init() and it trigs a div0 hang. driver/mtd/nand/nand_base.c 2786 /* 2787 * Set the number of read / write steps for one page depending on ECC 2788 * mode 2789 */ 2790 chip->ecc.steps = mtd->writesize / chip->ecc.size; 2791 if(chip->ecc.steps * chip->ecc.size != mtd->writesize) { 2792 printk(KERN_WARNING "Invalid ecc parameters\n"); 2793 BUG(); 2794 } 2795 chip->ecc.total = chip->ecc.steps * chip->ecc.bytes; 2796 -- FIXME if it is wrong.

2 1