June 2010 - U-Boot

[U-Boot] [PATCH] fdt_support: add entry for sec3.1 and remove tls_ssl_stream descriptor type capability for sec3.3
by Kim Phillips 30 Jun '10

30 Jun '10

Add sec3.1 h/w geometry for fdt node fixups. Also, technically, whilst SEC v3.3 h/w honours the tls_ssl_stream descriptor type, it lacks the ARC4 algorithm execution unit required to be able to execute anything meaningful with it. Change the node to agree with the documentation that declares that the sec3.3 really doesn't have such a descriptor type. Reported-by: Haiying Wang <Haiying.Wang(a)freescale.com> Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- common/fdt_support.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index b6f252a..a8ac617 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -534,7 +534,8 @@ void fdt_fixup_crypto_node(void *blob, int sec_rev) { 0x0202, 1, 24, 0x04c, 0x0122003f }, /* SEC 2.2 */ { 0x0204, 4, 24, 0x07e, 0x012b0ebf }, /* SEC 2.4 */ { 0x0300, 4, 24, 0x9fe, 0x03ab0ebf }, /* SEC 3.0 */ - { 0x0303, 4, 24, 0x97c, 0x03ab0abf }, /* SEC 3.3 */ + { 0x0301, 4, 24, 0xbfe, 0x03ab0ebf }, /* SEC 3.1 */ + { 0x0303, 4, 24, 0x97c, 0x03a30abf }, /* SEC 3.3 */ }; char compat_strlist[ARRAY_SIZE(sec_rev_prop_list) * sizeof("fsl,secX.Y")]; -- 1.7.0.5

3 6

[U-Boot] [STATUS] U-Boot v2010.06 released - Merge Window OPEN
by Wolfgang Denk 30 Jun '10

30 Jun '10

Hello all, U-Boot v2010.06 has been released and is available from the git repository and the FTP server. The "next" branch has been pulled into mainline ("master" branch) and has been removed afterward. The Merge Window for the next release (v2010.09) is open until Sat Jul 17, 2010, 23:59:59 CET = 17 days remaining. The next release v2010.09" is scheduled for September 12, 2010. See http://www.denx.de/wiki/U-Boot/ReleaseCycle for details, including guestimates for the next releases after that. A little statistics [1] - changes since release v2020.03: Processed 447 csets from 101 developers 29 employers found A total of 42309 lines added, 22806 removed (delta 19503) Developers with the most changesets Thomas Chou 28 (6.3%) Graeme Russ 26 (5.8%) Wolfgang Denk 23 (5.1%) Peter Tyser 22 (4.9%) Stefano Babic 19 (4.3%) Kumar Gala 16 (3.6%) Frans Meulenbroeks 16 (3.6%) Anatolij Gustschin 14 (3.1%) Mike Frysinger 14 (3.1%) TsiChung Liew 13 (2.9%) ... Developers with the most changed lines Thomas Chou 12324 (21.4%) Wolfgang Denk 5002 (8.7%) Cyril Chemparathy 4714 (8.2%) Vaibhav Hiremath 2844 (4.9%) Graeme Russ 2562 (4.5%) Anatolij Gustschin 2373 (4.1%) Stefan Roese 2211 (3.8%) Minkyu Kang 1595 (2.8%) Albert Aribaud 1534 (2.7%) Wolfgang Wegner 1375 (2.4%) ... Developers with the most lines removed Thomas Chou 8029 (35.2%) Detlev Zundel 1280 (5.6%) Scott McNutt 435 (1.9%) Fabio Estevam 68 (0.3%) Michal Simek 64 (0.3%) Mike Frysinger 44 (0.2%) Mahavir Jain 7 (0.0%) Matthias Kaehlcke 4 (0.0%) Harald Krapfenbauer 3 (0.0%) Guennadi Liakhovetski 2 (0.0%) ... Developers with the most signoffs (total 649) Scott McNutt 52 (8.0%) Kumar Gala 52 (8.0%) Ben Warren 45 (6.9%) Sandeep Paulraj 44 (6.8%) Thomas Chou 28 (4.3%) Stefan Roese 26 (4.0%) Graeme Russ 26 (4.0%) Peter Tyser 22 (3.4%) Mike Frysinger 20 (3.1%) Kim Phillips 20 (3.1%) Stefano Babic 19 (2.9%) ... Developers with the most reviews (total 4) Wolfgang Denk 4 (100.0%) Developers with the most test credits (total 30) Ian Abbott 8 (26.7%) Ben Gardiner 4 (13.3%) Wolfgang Denk 2 (6.7%) Thomas Chou 2 (6.7%) Peter Tyser 2 (6.7%) Anatolij Gustschin 2 (6.7%) Heiko Schocher 2 (6.7%) Prafulla Wadaskar 2 (6.7%) Tom 2 (6.7%) Magnus Lilja 2 (6.7%) ... Developers who gave the most tested-by credits (total 30) Wolfgang Denk 16 (53.3%) Thomas Chou 4 (13.3%) Ben Warren 3 (10.0%) Delio Brignoli 2 (6.7%) Mike Frysinger 1 (3.3%) Stefano Babic 1 (3.3%) Ed Swarthout 1 (3.3%) Vitaly Kuzmichev 1 (3.3%) Felix Radensky 1 (3.3%) Developers with the most report credits (total 4) Haiying Wang 2 (50.0%) Peter Meerwald 2 (50.0%) Developers who gave the most report credits (total 4) Wolfgang Denk 2 (50.0%) Mike Frysinger 1 (25.0%) Kim Phillips 1 (25.0%) Top changeset contributors by employer (Unknown) 117 (26.2%) DENX Software Engineering 79 (17.7%) Freescale 53 (11.9%) Graeme Russ 26 (5.8%) Extreme Engineering Solutions 24 (5.4%) Texas Instruments 20 (4.5%) Analog Devices 16 (3.6%) Samsung 14 (3.1%) MontaVista 8 (1.8%) Psyent 8 (1.8%) ... Top lines changed by employer (Unknown) 24344 (42.3%) DENX Software Engineering 12948 (22.5%) Texas Instruments 7921 (13.8%) Graeme Russ 3048 (5.3%) Samsung 1802 (3.1%) Extreme Engineering Solutions 1366 (2.4%) Freescale 1253 (2.2%) Matrix Vision 1095 (1.9%) Psyent 1051 (1.8%) Wind River 974 (1.7%) ... Employers with the most signoffs (total 649) (Unknown) 162 (25.0%) Freescale 126 (19.4%) DENX Software Engineering 82 (12.6%) Texas Instruments 72 (11.1%) Psyent 52 (8.0%) Samsung 33 (5.1%) Graeme Russ 26 (4.0%) Extreme Engineering Solutions 24 (3.7%) Analog Devices 22 (3.4%) MontaVista 8 (1.2%) ... [1] See http://www.denx.de/wiki/U-Boot/UbootStat_2010_06 for full statistics, and http://www.denx.de/wiki/UBoot/ReleaseCycle for links to statistics for earlier releases. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de If I have seen further it is by standing on the shoulders of giants. - Isaac Newton, Letter to Robert Hooke, 5 February 1676

1 0

[U-Boot] Marketing Jurídico | Newsletter Inrise Consultoria | Edição 16 | Ano 03
by Inrise Consultoria 30 Jun '10

30 Jun '10

Seu programa de e-mail não está configurado para acessar mensagens no formato HTML. Para visualizar este email copie e cole o seguinte link em seu navegador: www.inriseconsultoria.com.br/emailmkt/visualizar.php?key=19c5f446bbdb174&id…

1 0

[U-Boot] Numonyx NOR support in u-boot
by Todd Fischer 30 Jun '10

30 Jun '10

Hi, We are seeing NOR write failures on 6 of the 10 boards (DM6446 ARM SoC with Numonyx JS28F256M29EWL NOR flash chip). Four of the boards seem to work without error. All 10 boards were made on the same manufacturing line at the same time. Initially, we couldn't properly read the QRY response from the chip. We had to use this patch http://www.mail-archive.com/u-boot@lists.denx.de/msg26614.html We are getting 'flash not erased' error or timeout error. We have tried monitoring D7 (busy) and monitoring D6 (activity toggle) to detect erase / program command completion / timeout. We have tried changing the timing of the control signals to the NOR chip, but need to use a logic state analyzer to verify the timing is changed as expected. Example error output: > cp 0x81700000 0x02000000 0x400000 Copy to Flash... Flash not Erased Timeout writing to Flash > cp 0x81700000 0x02000000 0x400000 Copy to Flash... Flash write timeout at address 2000000 data 129f34 We have tried cp, cp.b, cp.w and get the same results. With 4 boards working correctly, the code must be close. Any suggestions (beyond looking at the signals with a Logic State Analyzer)? Todd

2 1

[U-Boot] [PATCH v2] PXA: New MMC driver
by Marek Vasut 30 Jun '10

30 Jun '10

The new driver is a complete rewrite. It uses the MMC framework and should support both pxa2xx and pxa3xx. This driver needs testing though. Change since v1: - Handle PXA27x CRC bug (erratum #42) Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- drivers/mmc/Makefile | 1 + drivers/mmc/pxa_mmc_gen.c | 352 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 353 insertions(+), 0 deletions(-) create mode 100644 drivers/mmc/pxa_mmc_gen.c diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 6fa04b8..01338a4 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -32,6 +32,7 @@ COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o +COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c new file mode 100644 index 0000000..a158000 --- /dev/null +++ b/drivers/mmc/pxa_mmc_gen.c @@ -0,0 +1,352 @@ +/* + * Copyright (C) 2010 Marek Vasut <marek.vasut(a)gmail.com> + * + * Loosely based on the old code and Linux's PXA MMC driver + * + * 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 <common.h> +#include <malloc.h> + +#include <mmc.h> +#include <asm/errno.h> +#include <asm/arch/hardware.h> + +#include "pxa_mmc.h" + +#define PXA_MMC_TIMEOUT 100 + +static int pxa_mmc_stop_clock(void) +{ + int timeout = PXA_MMC_TIMEOUT; + + /* If the clock aren't running, exit */ + if (!(MMC_STAT & MMC_STAT_CLK_EN)) + return 0; + + /* Tell the controller to turn off the clock */ + MMC_STRPCL = MMC_STRPCL_STOP_CLK; + + /* Wait until the clock are off */ + while ((MMC_STAT & MMC_STAT_CLK_EN) && --timeout) + udelay(10); + + /* The clock refused to stop, scream and die a painful death */ + if (!timeout) + return -ETIMEDOUT; + + /* The clock stopped correctly */ + return 0; +} + +static int pxa_mmc_start_cmd(struct mmc_cmd *cmd, unsigned long cmdat) +{ + int timeout = PXA_MMC_TIMEOUT; + + /* The card can send a "busy" response */ + if (cmd->flags & MMC_RSP_BUSY) + cmdat |= MMC_CMDAT_BUSY; + + /* Inform the controller about response type */ + switch (cmd->resp_type) { + case MMC_RSP_R1: + case MMC_RSP_R1b: + cmdat |= MMC_CMDAT_R1; + break; + case MMC_RSP_R2: + cmdat |= MMC_CMDAT_R2; + break; + case MMC_RSP_R3: + cmdat |= MMC_CMDAT_R3; + break; + default: + break; + } + + /* Load command and it's arguments into the controller */ + MMC_CMD = cmd->cmdidx; + MMC_ARGH = cmd->cmdarg >> 16; + MMC_ARGL = cmd->cmdarg & 0xffff; + MMC_CMDAT = cmdat; + + /* Start the controller clock and wait until they are started */ + MMC_STRPCL = MMC_STRPCL_START_CLK; + while (!(MMC_STAT & MMC_STAT_CLK_EN) && --timeout) + udelay(10); + + /* The clock didn't start, we have a problem */ + if (!timeout) + return -ETIMEDOUT; + + /* Correct and happy end */ + return 0; +} + +static int pxa_mmc_cmd_done(struct mmc_cmd *cmd) +{ + unsigned long a, b, c; + int i; + int stat; + + /* Read the controller status */ + stat = MMC_STAT; + + /* + * Linux says: + * Did I mention this is Sick. We always need to + * discard the upper 8 bits of the first 16-bit word. + */ + a = MMC_RES & 0xffff; + for (i = 0; i < 4; i++) { + b = MMC_RES & 0xffff; + c = MMC_RES & 0xffff; + cmd->response[i] = (a << 24) | (b << 8) | (c >> 8); + a = c; + } + + /* The command response didn't arrive */ + if (stat & MMC_STAT_TIME_OUT_RESPONSE) + return -ETIMEDOUT; + else if (stat & MMC_STAT_RES_CRC_ERROR && cmd->flags & MMC_RSP_CRC) { +#if defined(CONFIG_PXA27X) + if (cmd->flags & MMC_RSP_136 && cmd->response[0] & 0x80000000) + printf("Ignoring CRC, this may be dangerous!\n"); + else +#endif + return -EILSEQ; + } + + /* The command response was successfully read */ + return 0; +} + +static int pxa_mmc_do_read_xfer(struct mmc_data *data) +{ + unsigned long len; + int i; + int timeout = PXA_MMC_TIMEOUT; + + len = data->blocks * data->blocksize; + + while (len) { + /* The controller has data ready */ + if (MMC_I_REG & MMC_I_REG_RXFIFO_RD_REQ) { +#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS) + i = min(len, 32); +#else + i = 1; +#endif + while (i--) { + *data->dest++ = *((volatile uchar *)&MMC_RXFIFO); + len--; + } + } + + if (MMC_STAT & MMC_STAT_ERRORS) + return -EIO; + } + + /* Wait for the transmission-done interrupt */ + while (!(MMC_I_REG & MMC_I_REG_DATA_TRAN_DONE) && --timeout) + udelay(10); + + if (!timeout) + return -ETIMEDOUT; + + return 0; +} + +static int pxa_mmc_do_write_xfer(struct mmc_data *data) +{ + unsigned long len; + int i, bytes; + int timeout = PXA_MMC_TIMEOUT; + + len = data->blocks * data->blocksize; + + while (len) { + /* The controller is ready to receive data */ + if (MMC_I_REG & MMC_I_REG_TXFIFO_WR_REQ) { + bytes = min(32, len); + + for (i = 0; i < bytes; i++) + MMC_TXFIFO = *data->src++; + + if (bytes < 32) + MMC_PRTBUF = MMC_PRTBUF_BUF_PART_FULL; + + len -= bytes; + } + + if (MMC_STAT & MMC_STAT_ERRORS) + return -EIO; + } + + /* Wait for the transmission-done interrupt */ + while (!(MMC_I_REG & MMC_I_REG_DATA_TRAN_DONE) && --timeout) + udelay(10); + + if (!timeout) + return -ETIMEDOUT; + + /* Wait until the data are really written to the card */ + timeout = PXA_MMC_TIMEOUT; + while (!(MMC_I_REG & MMC_I_REG_PRG_DONE) && --timeout) + udelay(10); + + if (!timeout) + return -ETIMEDOUT; + + return 0; +} + +static int pxa_mmc_request(struct mmc *mmc, struct mmc_cmd *cmd, + struct mmc_data *data) +{ + unsigned long cmdat = 0; + int timeout = PXA_MMC_TIMEOUT; + int ret; + + /* Stop the controller */ + ret = pxa_mmc_stop_clock(); + if (ret) + return ret; + + /* If we're doing data transfer, configure the controller accordingly */ + if (data) { + MMC_NOB = data->blocks; + MMC_BLKLEN = data->blocksize; + /* This delay can be optimized, but stick with max value */ + MMC_RDTO = 0xffff; + cmdat |= MMC_CMDAT_DATA_EN; + if (data->flags & MMC_DATA_WRITE) + cmdat |= MMC_CMDAT_WRITE; + } + + /* Run in 4bit mode if the card can do it */ + if (mmc->bus_width == 4) + cmdat |= MMC_CMDAT_SD_4DAT; + + /* Execute the command */ + ret = pxa_mmc_start_cmd(cmd, cmdat); + if (ret) + return ret; + + /* Wait until the command completes */ + while (!(MMC_I_REG & MMC_I_REG_END_CMD_RES) && --timeout) + udelay(10); + + /* If the command doesn't complete, die */ + if (!timeout) + return -ETIMEDOUT; + + /* Read back the result */ + ret = pxa_mmc_cmd_done(cmd); + if (ret) + return ret; + + /* In case there was a data transfer scheduled, do it */ + if (data) { + if (data->flags & MMC_DATA_WRITE) + pxa_mmc_do_write_xfer(data); + else + pxa_mmc_do_read_xfer(data); + } + + return 0; +} + +static void pxa_mmc_set_ios(struct mmc *mmc) +{ + unsigned long tmp; + unsigned long pxa_mmc_clock; + + /* Set clock to the card */ + if (mmc->clock) { + /* PXA3xx can do 26MHz with special settings */ + if (mmc->clock == 26000000) + MMC_CLKRT = 0x7; + else { + pxa_mmc_clock = 0; + tmp = mmc->f_max / mmc->clock; + tmp += tmp % 2; + while (tmp > 1) { + pxa_mmc_clock++; + tmp >>= 1; + } + MMC_CLKRT = pxa_mmc_clock; + } + } else + pxa_mmc_stop_clock(); +} + +static int pxa_mmc_setup(struct mmc *mmc) +{ + + /* Enable MMC unit clock */ +#ifdef CONFIG_CPU_MONAHANS /* pxa3xx */ + CKENA |= CKENA_12_MMC0 | CKENA_13_MMC1; +#else /* pxa2xx */ + CKEN |= CKEN12_MMC; +#endif + /* Make sure the clock are stopped */ + pxa_mmc_stop_clock(); + /* Turn off SPI mode */ + MMC_SPI = MMC_SPI_DISABLE; + /* Set up maximum timeout to wait for command response */ + MMC_RESTO = MMC_RES_TO_MAX; + /* Mask all interrupts */ + MMC_I_MASK = MMC_I_MASK_ALL; + return 0; +} + +int pxa_mmc_init(bd_t *bis) +{ + struct mmc *mmc = NULL; + + mmc = malloc(sizeof(struct mmc)); + + if (!mmc) + return -ENOMEM; + sprintf(mmc->name, "PXA MMC"); + mmc->send_cmd = pxa_mmc_request; + mmc->set_ios = pxa_mmc_set_ios; + mmc->init = pxa_mmc_setup; + mmc->host_caps = MMC_MODE_4BIT; + + mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; +#if defined(CONFIG_CPU_MONAHANS) + mmc->f_max = 26000000; + mmc->f_min = 304000; + mmc->host_caps |= MMC_MODE_HS; +#elif defined(CONFIG_PXA27X) + mmc->f_max = 19500000; + mmc->f_min = 304000; +#else + mmc->f_max = 20000000; + mmc->f_min = 3125000; +#endif + mmc_register(mmc); + + return 0; +} + +int cpu_mmc_init(bd_t *bis) +{ + return pxa_mmc_init(bis); +} -- 1.7.1

1 0

[U-Boot] [PATCH] MPC5200: workaround data corruption for unaligned local bus accesses
by Wolfgang Denk 29 Jun '10

29 Jun '10

The MPC5200 has a nasty problem that will cause silent data corruption when performing unaligned 16 or 32 byte accesses when reading from the local bus - typically this affects reading from flash. The problem can be easily shown: => md fc0c0000 10 fc0c0000: 323e4337 01626f6f 74636d64 3d72756e 2>C7.bootcmd=run fc0c0010: 206e6574 5f6e6673 00626f6f 7464656c net_nfs.bootdel fc0c0020: 61793d35 00626175 64726174 653d3131 ay=5.baudrate=11 fc0c0030: 35323030 00707265 626f6f74 3d656368 5200.preboot=ech => md fc0c0001 10 fc0c0001: 65636801 00000074 0000003d 00000020 ech....t...=... fc0c0011: 0000005f 00000000 00000074 00000061 ..._.......t...a fc0c0021: 00000000 00000064 00000065 00000035 .......d...e...5 fc0c0031: 00000000 00000062 0000003d 0000006f .......b...=...o => md.w fc0c0001 10 fc0c0001: 0000 3701 0000 6f74 0000 643d 0000 6e20 ..7...ot..d=..n fc0c0011: 0000 745f 0000 7300 0000 6f74 0000 6c61 ..t_..s...ot..la This commit implements a workaround at least for the most blatant problem: using memcpy() from NOR flash. We rename the assembler routine into __memcpy() and provide a wrapper, which will use a byte-wise copy loop for source addresses in NOR flash, and branch to the optimized __memcpy() otherwise. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- arch/powerpc/cpu/mpc5xxx/Makefile | 5 ++ arch/powerpc/cpu/mpc5xxx/memcpy_mpc5200.c | 62 +++++++++++++++++++++++++++++ arch/powerpc/lib/Makefile | 5 ++ 3 files changed, 72 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/cpu/mpc5xxx/memcpy_mpc5200.c diff --git a/arch/powerpc/cpu/mpc5xxx/Makefile b/arch/powerpc/cpu/mpc5xxx/Makefile index 0ee0611..4ab2b7b 100644 --- a/arch/powerpc/cpu/mpc5xxx/Makefile +++ b/arch/powerpc/cpu/mpc5xxx/Makefile @@ -30,6 +30,11 @@ SOBJS = io.o firmware_sc_task_bestcomm.impl.o COBJS = i2c.o traps.o cpu.o cpu_init.o ide.o interrupts.o \ loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o +# Workaround for local bus unaligned access problem on MPC5200 +#ifdef CONFIG_MPC5200 +COBJS += memcpy_mpc5200.o +#endif + SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) START := $(addprefix $(obj),$(START)) diff --git a/arch/powerpc/cpu/mpc5xxx/memcpy_mpc5200.c b/arch/powerpc/cpu/mpc5xxx/memcpy_mpc5200.c new file mode 100644 index 0000000..5c2e64f --- /dev/null +++ b/arch/powerpc/cpu/mpc5xxx/memcpy_mpc5200.c @@ -0,0 +1,62 @@ +/* + * (C) Copyright 2010 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * 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 + */ + +/* + * This is a workaround for issues on the MPC5200, where unaligned + * 32-bit-accesses to the local bus will deliver corrupted data. This + * happens for example when trying to use memcpy() from an odd NOR + * flash address; the behaviour can be also seen when using "md" on an + * odd NOR flash address (but there it is not a bug in U-Boot, which + * only shows the behaviour of this processor). + * + * For memcpy(), we test if the source address is in NOR flash, and + * perform byte-wise (slow) copy then; otherwise we use the optimized + * (fast) real __memcpy(). + */ + +#include <common.h> +#include <flash.h> +#include <linux/types.h> + +void *memcpy(void *trg, const void *src, size_t len) +{ + extern void* __memcpy(void *, const void *, size_t); + char *s = (char *)src; + char *t = (char *)trg; + void *dest = src; + + /* + * Check is source address is in flash: + * If not, we use the fast assembler code + */ + if (addr2info((ulong)src) == NULL) + return __memcpy(trg, src, len); + + /* + * Copying from flash, perform byte by byte copy. + */ + while (len-- > 0) + *t++ = *s++; + + return dest; +} diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 5f85502..4ba51b3 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -43,6 +43,11 @@ COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) +# Workaround for local bus unaligned access problem on MPC5200 +#ifdef CONFIG_MPC5200 +$(obj)ppcstring.o: AFLAGS += -Dmemcpy=__memcpy +#endif + $(LIB): $(obj).depend $(OBJS) @if ! $(CROSS_COMPILE)readelf -S $(OBJS) | grep -q '\.fixup.*PROGBITS';\ then \ -- 1.7.0.1

6 22

[U-Boot] [PATCH 1/2] powerpc/bootcount: Add bootcount support for MPC512x
by Detlev Zundel 29 Jun '10

29 Jun '10

From: Michael Weiss <michael.weiss(a)ifm.com> This also uses the breadcrumb register as on MPC5200. Signed-off-by: Michael Weiss <michael.weiss(a)ifm.com> Signed-off-by: Detlev Zundel <dzu(a)denx.de> --- arch/powerpc/lib/bootcount.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/lib/bootcount.c b/arch/powerpc/lib/bootcount.c index 6346527..0373a20 100644 --- a/arch/powerpc/lib/bootcount.c +++ b/arch/powerpc/lib/bootcount.c @@ -35,6 +35,11 @@ #define CONFIG_SYS_BOOTCOUNT_SINGLEWORD #endif /* defined(CONFIG_MPC5xxx) */ +#if defined(CONFIG_MPC512X) +#define CONFIG_SYS_BOOTCOUNT_ADDR (&((immap_t *)CONFIG_SYS_IMMR)->clk.bcr) +#define CONFIG_SYS_BOOTCOUNT_SINGLEWORD +#endif /* defined(CONFIG_MPC512X) */ + #if defined(CONFIG_8xx) #define CONFIG_SYS_BOOTCOUNT_ADDR (((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_dpmem + \ CPM_BOOTCOUNT_ADDR) -- 1.6.2.5

2 3

[U-Boot] [PATCH] tsec: Fix eTSEC2 link problem on P2020RDB
by Felix Radensky 29 Jun '10

29 Jun '10

On P2020RDB eTSEC2 is connected to Vitesse VSC8221 PHY via SGMII. Current TBI PHY settings for SGMII mode cause link problems on this platform, link never comes up. Fix this by making TBI PHY settings configurable and add a working configuration for P2020RDB. Signed-off-by: Felix Radensky <felix(a)embedded-sol.com> --- drivers/net/tsec.c | 6 +++++- include/configs/P1_P2_RDB.h | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 3e4c3bd..5fa6f61 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -281,12 +281,16 @@ static uint tsec_local_mdio_read(volatile tsec_mdio_t *phyregs, | TBIANA_FULL_DUPLEX \ ) -/* Force the TBI PHY into 1000Mbps full duplex when in SGMII mode */ +/* By default force the TBI PHY into 1000Mbps full duplex when in SGMII mode */ +#ifndef CONFIG_TSEC_TBICR_SETTINGS #define TBICR_SETTINGS ( \ TBICR_PHY_RESET \ | TBICR_FULL_DUPLEX \ | TBICR_SPEED1_SET \ ) +#else +#define TBICR_SETTINGS CONFIG_TSEC_TBICR_SETTINGS +#endif /* CONFIG_TSEC_TBICR_SETTINGS */ /* Configure the TBI for SGMII operation */ static void tsec_configure_serdes(struct tsec_private *priv) diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index a9b4004..4b7e190 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -425,6 +425,15 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_ETHPRIME "eTSEC1" #define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */ + +/* TBI PHY configuration for SGMII mode */ +#define CONFIG_TSEC_TBICR_SETTINGS ( \ + TBICR_PHY_RESET \ + | TBICR_ANEG_ENABLE \ + | TBICR_FULL_DUPLEX \ + | TBICR_SPEED1_SET \ + ) + #endif /* CONFIG_TSEC_ENET */ /* -- 1.5.4.3

4 4

[U-Boot] [RFC] AT91SAM9 series - cleanup USART definitions
by Reinhard Meyer 29 Jun '10

29 Jun '10

Hi, AT91SAM9 based boards have something like this in their include/configs file: #define CONFIG_ATMEL_USART 1 #undef CONFIG_USART0 #undef CONFIG_USART1 #undef CONFIG_USART2 #define CONFIG_USART3 1 /* USART 3 is DBGU */ these defines are used in drivers/serial/atmel_usart.c: #if defined(CONFIG_USART0) # define USART_ID 0 # define USART_BASE USART0_BASE #elif defined(CONFIG_USART1) # define USART_ID 1 # define USART_BASE USART1_BASE #elif defined(CONFIG_USART2) # define USART_ID 2 # define USART_BASE USART2_BASE #elif defined(CONFIG_USART3) # define USART_ID 3 # define USART_BASE USART3_BASE #endif USARTx_BASE is defined in arch/arm/include/asm/arch-at91/memory_map.h: #define USART0_BASE AT91_USART0 #define USART1_BASE AT91_USART1 #define USART2_BASE AT91_USART2 #define USART3_BASE (AT91_BASE_SYS + AT91_DBGU) #define SPI0_BASE AT91_BASE_SPI (note that nothing else is defined in that file!) AT91_USARTx finally comes from arch/arm/include/asm/arch-at91/at91sam*.h: #define AT91_USART0 AT91SAM9260_BASE_US0 #define AT91_USART1 AT91SAM9260_BASE_US1 #define AT91_USART2 AT91SAM9260_BASE_US2 #define AT91_USART3 AT91SAM9260_BASE_US3 #define AT91_USART4 AT91SAM9260_BASE_US4 #define AT91_USART5 AT91SAM9260_BASE_US5 1. memory_map.h is misleading, it just defines a few USARTs and one SPI 2. equalling CONFIG_USART3 with the debug UART is plain wrong, the 9260 for example has 6 'regular' USARTs (0..5) plus the debug UART I propose to make the following changes: 1. get rid of memory_map.h and the references to it, move the USART definitions to the respective at91sam*.h files 2. use DBU_BASE for the debug UART, leaving USART[0-5]_BASE to adress the 'regular' USARTs 3. use CONFIG_UARTDEBUG to indicate use of the debug UART for console output Note for those that don't want to dig the datasheets: the debug UART is software compatible to the 'regular' USARTs as long as only asynchronous features are used (true for the atmel_usart.c driver) Reinhard

2 3

[U-Boot] [PATCH] Tools: set multiple variable with fw_setenv utility
by Stefano Babic 29 Jun '10

29 Jun '10

Add a sort of batch mode to fw_setenv, allowing to set multiple variables in one shot, without updating the flash after each set as now. It is added the possibility to pass a config file with a list of pairs <variable, value> to be set, separated by a TAB character. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- tools/env/fw_env.c | 216 +++++++++++++++++++++++++++++++++++++++-------- tools/env/fw_env.h | 7 ++ tools/env/fw_env_main.c | 32 +++++++- 3 files changed, 218 insertions(+), 37 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index a46205d..506a806 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -45,9 +45,6 @@ #include "fw_env.h" -#define CMD_GETENV "fw_printenv" -#define CMD_SETENV "fw_setenv" - #define min(x, y) ({ \ typeof(x) _min1 = (x); \ typeof(y) _min2 = (y); \ @@ -328,29 +325,15 @@ int fw_printenv (int argc, char *argv[]) } /* - * Deletes or sets environment variables. Returns -1 and sets errno error codes: - * 0 - OK - * EINVAL - need at least 1 argument - * EROFS - certain variables ("ethaddr", "serial#") cannot be - * modified or deleted - * + * Set/Clear a single variable in the environment. + * This is called in sequence to update the environment + * in RAM without updating the copy in flash after each set */ -int fw_setenv (int argc, char *argv[]) +int fw_set_single_var(char *name, char *value) { - int i, len; + int len; char *env, *nxt; char *oldval = NULL; - char *name; - - if (argc < 2) { - errno = EINVAL; - return -1; - } - - if (env_init ()) - return -1; - - name = argv[1]; /* * search if variable with this name already exists @@ -358,7 +341,7 @@ int fw_setenv (int argc, char *argv[]) for (nxt = env = environment.data; *env; env = nxt + 1) { for (nxt = env; *nxt; ++nxt) { if (nxt >= &environment.data[ENV_SIZE]) { - fprintf (stderr, "## Error: " + fprintf(stderr, "## Error: " "environment not terminated\n"); errno = EINVAL; return -1; @@ -396,8 +379,8 @@ int fw_setenv (int argc, char *argv[]) } /* Delete only ? */ - if (argc < 3) - goto WRITE_FLASH; + if (!value || !strlen(value)) + return 0; /* * Append new definition at the end @@ -411,41 +394,204 @@ int fw_setenv (int argc, char *argv[]) */ len = strlen (name) + 2; /* add '=' for first arg, ' ' for all others */ - for (i = 2; i < argc; ++i) { - len += strlen (argv[i]) + 1; - } + len += strlen(value) + 1; + if (len > (&environment.data[ENV_SIZE] - env)) { fprintf (stderr, "Error: environment overflow, \"%s\" deleted\n", name); return -1; } + while ((*env = *name++) != '\0') env++; + *env = '='; + while ((*++env = *value++) != '\0') + ; + + /* end is marked with double '\0' */ + *++env = '\0'; + + return 0; +} + +/* + * Deletes or sets environment variables. Returns -1 and sets errno error codes: + * 0 - OK + * EINVAL - need at least 1 argument + * EROFS - certain variables ("ethaddr", "serial#") cannot be + * modified or deleted + * + */ +int fw_setenv(int argc, char *argv[]) +{ + int i, len; + char *env; + char *name; + char *value = NULL; + char *tmpval = NULL; + + if (argc < 2) { + errno = EINVAL; + return -1; + } + + if (env_init()) + return -1; + + name = argv[1]; + + /* + * Overflow when: + * "name" + "=" + "val" +"\0\0" > CONFIG_ENV_SIZE - (env-environment) + */ + len = strlen(name) + 2; + /* add '=' for first arg, ' ' for all others */ + for (i = 2; i < argc; ++i) + len += strlen(argv[i]) + 1; + + if (len > (&environment.data[ENV_SIZE] - env)) { + fprintf(stderr, + "Error: environment overflow, \"%s\" deleted\n", + name); + return -1; + } + + /* Allocate enough place to the data string */ for (i = 2; i < argc; ++i) { char *val = argv[i]; + if (!value) { + value = (char *)malloc(len - strlen(name)); + memset(value, 0, len - strlen(name)); + tmpval = value; + } + if (i != 2) + *tmpval++ = ' '; + while (*val != '\0') + *tmpval++ = *val++; + } + + fw_set_single_var(name, value); - *env = (i == 2) ? '=' : ' '; - while ((*++env = *val++) != '\0'); + /* + * Update CRC + */ + *environment.crc = crc32(0, (uint8_t *) environment.data, ENV_SIZE); + + /* write environment back to flash */ + if (flash_io(O_RDWR)) { + fprintf(stderr, "Error: can't write fw_env to flash\n"); + return -1; } - /* end is marked with double '\0' */ - *++env = '\0'; + if (value) + free(value); + + return 0; - WRITE_FLASH: +} + +/* + * Deletes or sets multiple environment variables. + * Returns -1 and sets errno error codes: + * 0 - OK + * EINVAL - need at least 1 argument + * EROFS - certain variables ("ethaddr", "serial#") cannot be + * modified or deleted + * + */ +int fw_setenv_multiple(fw_env_list *list, int count) +{ + + int i, ret; + + if (env_init()) + return -1; + + for (i = 0; i < count; i++) { + ret = fw_set_single_var(list[i].name, list[i].value); + if (ret) { + fprintf(stderr, "Error: can't set %s to %s\n", + list[i].name, list[i].value); + return -1; + } + } /* * Update CRC */ - *environment.crc = crc32 (0, (uint8_t *) environment.data, ENV_SIZE); + *environment.crc = crc32(0, (uint8_t *) environment.data, ENV_SIZE); /* write environment back to flash */ - if (flash_io (O_RDWR)) { + if (flash_io(O_RDWR)) { fprintf (stderr, "Error: can't write fw_env to flash\n"); return -1; } return 0; + +} + +/* + * Parse script to generate list of variables to set + * The script file has a very simple format, as follows: + * + * Each line has a couple with name, value: + * variable_name<TAB>variable_value + * + * Both variable_name and variable_value are interpreted as strings. + * Any character after <TAB> and before ending \r\n is interpreted + * as variable's value (no comment allowed on these lines !) + * + * Comments are allowed if the first character in the line is # + * + * Returns -1 and sets errno error codes: + * 0 - OK + * -1 - Error + */ +int fw_parse_script(char *fname, fw_env_list *list, int count) +{ + FILE *fp; + int i = 0; + char dump[128]; + char *name; + char *val; + + + fp = fopen(fname, "r"); + if (fp == NULL) + return -1; + + while (fgets(dump, sizeof(dump), fp)) { + /* Skip incomplete conversions and comment strings */ + if (dump[0] == '#') + continue; + + list[i].name[0] = '\0'; + list[i].value[0] = '\0'; + + val = strtok(dump, "\r\n"); + if (!val) + continue; + + name = strtok(dump, "\t"); + if (!name) + continue; + + strncpy(list[i].name, name, sizeof(list[i].name) - 1); + + val = strtok(NULL, "\t"); + if (val) + strncpy(list[i].value, val, sizeof(list[i].value) - 1); + + printf("name = %s value = %s\n", list[i].name, list[i].value); + i++; + + if (i >= count) + return count; + } + + return i; } /* diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index c04da54..bd494c0 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -47,8 +47,15 @@ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ "bootm" +typedef struct { + char name[255]; + char value[255]; +} fw_env_list; + extern int fw_printenv(int argc, char *argv[]); extern char *fw_getenv (char *name); extern int fw_setenv (int argc, char *argv[]); +extern int fw_parse_script(char *fname, fw_env_list *list, int count); +extern int fw_setenv_multiple(fw_env_list *list, int count); extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned); diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index 7f631c4..42a7168 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -42,16 +42,26 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <getopt.h> #include "fw_env.h" #define CMD_PRINTENV "fw_printenv" #define CMD_SETENV "fw_setenv" +#define MAX_SET_VARS 1024 + +static struct option long_options[] = { + {"script", required_argument, NULL, 's'}, + {NULL, 0, NULL, 0} +}; int main(int argc, char *argv[]) { char *p; char *cmdname = *argv; + char *script_file = NULL; + fw_env_list *list; + int c, count; if ((p = strrchr (cmdname, '/')) != NULL) { cmdname = p + 1; @@ -65,9 +75,27 @@ main(int argc, char *argv[]) return (EXIT_SUCCESS); } else if (strcmp(cmdname, CMD_SETENV) == 0) { + while ((c = getopt_long (argc, argv, "s:", + long_options, NULL)) != EOF) { + switch (c) { + case 's': + script_file = optarg; + break; + } + } - if (fw_setenv (argc, argv) != 0) - return (EXIT_FAILURE); + if (!script_file) { + if (fw_setenv(argc, argv) != 0) + return EXIT_FAILURE; + } else { + list = (fw_env_list *)malloc(MAX_SET_VARS * + sizeof(fw_env_list)); + count = fw_parse_script(script_file, + list, MAX_SET_VARS); + + if (fw_setenv_multiple(list, count) != 0) + return EXIT_FAILURE; + } return (EXIT_SUCCESS); -- 1.6.3.3

3 10