September 2010 - U-Boot

[U-Boot] U-boot issue with Intel StrataFlash P30.
by Carlos Roberto Moratelli 11 Sep '10

11 Sep '10

Hi, I am porting the u-boot to a MPC8536E custom board and I am facing an issue with flash. When u-boot tries to detect the flash (INTEL STRATAFLASH P30) it just freeze. The u-boot is started from the same flash. The problem happen when the CFI Driver tries a read from flash (flash_read8()) for the first time. Please, see the log bellow. Has someone faced this kind of issue? Are there some tip to solve the problem? Thank you, Moratelli U-Boot 2010.06-00738-gae5b042-dirty (Sep 10 2010 - 18:02:00) CPU: 8536E, Version: 1.1, (0x803f0091) Core: E500, Version: 3.0, (0x80210030) Clock Configuration: CPU0:800 MHz, CCB:400 MHz, DDR:200 MHz (400 MT/s data rate) (Synchronous), LBC:25 MHz L1: D-cache 32 kB enabled I-cache 32 kB enabled DRAM: lcrr: 0x20004 128 MiB SDRAM test phase 1: write ok. SDRAM test phase 2: SDRAM test passed. Top of RAM usable for U-Boot at: 08000000 Reserving 728k for U-Boot at: 07f40000 Reserving 1032k for malloc() at: 07e3e000 Reserving 80 Bytes for Board Info at: 07e3dfb0 Reserving 80 Bytes for Global Data at: 07e3df60 Stack Pointer at: 07e3df48 New Stack Pointer is: 07e3df48 Now running in RAM - U-Boot at: 07f40000 FLASH: flash detect cfi fwc addr e0000000 cmd f0 f0 8bit x 8 bit fwc addr e0000000 cmd ff ff 8bit x 8 bit fwc addr e0000055 cmd 98 98 8bit x 8 bit is= cmd 51(Q) addr e0000010

3 2

[U-Boot] date time
by Charles Seedle 10 Sep '10

10 Sep '10

There is a messege in the u-boot boot log showing where it set the system time. I tried to setting the date and time using the linux command, "date". It set them but once the I rebooted the board the values for date and time were wrong again. Could this be related to the backup battery ? Is there a better way to do this ? Randy

1 0

[U-Boot] [PATCH] Followup fixes on the mtdparts spread patchset
by Scott Wood 10 Sep '10

10 Sep '10

Consolidate some code in mtd_get_len_incl_bad(), and fix a condition where a valid partition could be reported as truncated if it has a good block at the end of the device (unlikely, since the BBT is usually there). Fix mid-block declarations in net_part_size(). Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- common/cmd_mtdparts.c | 5 +++-- drivers/mtd/mtdcore.c | 15 +++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 17865b7..5481c88 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -1228,15 +1228,16 @@ static int generate_mtdparts_save(char *buf, u32 buflen) */ static uint64_t net_part_size(struct mtd_info *mtd, struct part_info *part) { + uint64_t i, net_size = 0; + if (!mtd->block_isbad) return part->size; - uint64_t i, net_size = 0; - for (i = 0; i < part->size; i += mtd->erasesize) { if (!mtd->block_isbad(mtd, part->offset + i)) net_size += mtd->erasesize; } + return net_size; } #endif diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 78f2a08..a195dda 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -162,11 +162,6 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset, *truncated = 0; *len_incl_bad = 0; - if (offset >= mtd->size) { - *truncated = 1; - return; - } - if (!mtd->block_isbad) { *len_incl_bad = length; return; @@ -176,6 +171,11 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset, uint64_t block_len; while (len_excl_bad < length) { + if (offset >= mtd->size) { + *truncated = 1; + return; + } + block_len = mtd->erasesize - (offset & (mtd->erasesize - 1)); if (!mtd->block_isbad(mtd, offset & ~(mtd->erasesize - 1))) @@ -183,11 +183,6 @@ void mtd_get_len_incl_bad(struct mtd_info *mtd, uint64_t offset, *len_incl_bad += block_len; offset += block_len; - - if (offset >= mtd->size) { - *truncated = 1; - break; - } } } #endif /* defined(CONFIG_CMD_MTDPARTS_SPREAD) */ -- 1.7.0.4

3 5

[U-Boot] Votre Appartement à DRAGUIGNAN
by info＠maxiMoteur.com 10 Sep '10

10 Sep '10

A vous, bailleur de l'appartement à DRAGUIGNAN, Si vous cherchez des LOCATAIRES pour votre bien, connectez-vous sur http://www.maxiMoteur.com (site de particuliers) MaxiMoteur: Vous aide à rechercher, vendre et louer votre bien immobilier entre PARTICULIERS partout en France. A plus de 1000 annonces de PARTICULIER par SEMAINE dans votre département le 83. Vous alerte dès qu'une nouvelle annonce correspond à vos critères. Cordialement, MaxiMoteur http://www.maxiMoteur.com Email : info(a)maxiMoteur.com Ne plus recevoir cet email http://www.maxiMoteur.com/unsubscribe.asp?id=a7cc0e1bb52d9f7034d21779683277…

1 0

[U-Boot] Summary of my patches for v2010.12 merge window
by Timur Tabi 09 Sep '10

09 Sep '10

Kumar, Since the merge window for v2010.12 will be open soon, I want to make sure that all of my pending patches are included. Here's a list of all the U-Boot patches I've submitted that I think should be in your next pull request: 1. [v2] p1022ds: add audclk hwconfig setting to enable codec reference clock 2. fsl: verify writes to the MAC address EEPROM 3. always relocate fdt into an lmb-allocated memory block 4. logos: add Freescale logo 5. [v3] fsl: refactor MPC8610 and MPC5121 DIU code to use existing bitmap and logo features 6. p1022ds: add video support Please note that Wolfgang has asked for someone else to test "always relocate fdt into an lmb-allocated memory block", but no one has done so yet, and you have no indicated that anyone will. Also, this patch is not 85xx-specific, but should be included anyway. Wolfgang, please check to see if it's being handled by the proper maintainer: 1. video: cfb_console: add support for 4bpp bitmaps with GDF_32BIT_X888RGB Thanks. -- Timur Tabi Linux kernel developer at Freescale

4 3

[U-Boot] [PATCH 1/5] nand util: read/write: accept unaligned length
by Scott Wood 09 Sep '10

09 Sep '10

The underlying code in nand_base.c already supports non-page-aligned reads and writes, but the block-skipping wrapper code did not. With block skipping, an unaligned start address is not useful since you really want to be starting at the beginning of a partition -- or at least that's where you want to start checking for blocks to skip, but we don't (yet) support that. So we still require the start address to be aligned. An unaligned length, though, is useful for passing $filesize to the read/write command, and handling it does not complicate block skipping. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/nand_base.c | 7 --- drivers/mtd/nand/nand_util.c | 93 ++++++++++++++++++++++++++++------------- 2 files changed, 63 insertions(+), 37 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ed1c9c9..48ba892 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2001,13 +2001,6 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, if (!writelen) return 0; - /* reject writes, which are not page aligned */ - if (NOTALIGNED(to) || NOTALIGNED(ops->len)) { - printk(KERN_NOTICE "nand_write: " - "Attempt to write not page aligned data\n"); - return -EINVAL; - } - column = to & (mtd->writesize - 1); subpage = column || (writelen & (mtd->writesize - 1)); diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 29c42f7..0f67790 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -28,6 +28,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * + * Copyright 2010 Freescale Semiconductor + * The portions of this file whose copyright is held by Freescale and which + * are not considered a derived work of GPL v2-only code may be distributed + * and/or modified 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. */ #include <common.h> @@ -423,36 +429,43 @@ int nand_unlock(struct mtd_info *mtd, ulong start, ulong length) #endif /** - * get_len_incl_bad + * check_skip_len * - * Check if length including bad blocks fits into device. + * Check if there are any bad blocks, and whether length including bad + * blocks fits into device * * @param nand NAND device * @param offset offset in flash * @param length image length - * @return image length including bad blocks + * @return 0 if the image fits and there are no bad blocks + * 1 if the image fits, but there are bad blocks + * -1 if the image does not fit */ -static size_t get_len_incl_bad (nand_info_t *nand, loff_t offset, - const size_t length) +static int check_skip_len(nand_info_t *nand, loff_t offset, size_t length) { - size_t len_incl_bad = 0; size_t len_excl_bad = 0; - size_t block_len; + int ret = 0; while (len_excl_bad < length) { - block_len = nand->erasesize - (offset & (nand->erasesize - 1)); + size_t block_len, block_off; + loff_t block_start; - if (!nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) - len_excl_bad += block_len; + if (offset >= nand->size) + return -1; - len_incl_bad += block_len; - offset += block_len; + block_start = offset & ~(loff_t)(nand->erasesize - 1); + block_off = offset & (nand->erasesize - 1); + block_len = nand->erasesize - block_off; - if (offset >= nand->size) - break; + if (!nand_block_isbad(nand, block_start)) + len_excl_bad += block_len; + else + ret = 1; + + offset += block_len; } - return len_incl_bad; + return ret; } /** @@ -474,29 +487,41 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, { int rval; size_t left_to_write = *length; - size_t len_incl_bad; u_char *p_buffer = buffer; + int need_skip; - /* Reject writes, which are not page aligned */ - if ((offset & (nand->writesize - 1)) != 0 || - (*length & (nand->writesize - 1)) != 0) { + /* + * nand_write() handles unaligned, partial page writes. + * + * We allow length to be unaligned, for convenience in + * using the $filesize variable. + * + * However, starting at an unaligned offset makes the + * semantics of bad block skipping ambiguous (really, + * you should only start a block skipping access at a + * partition boundary). So don't try to handle that. + */ + if ((offset & (nand->writesize - 1)) != 0) { printf ("Attempt to write non page aligned data\n"); + *length = 0; return -EINVAL; } - len_incl_bad = get_len_incl_bad (nand, offset, *length); - - if ((offset + len_incl_bad) > nand->size) { + need_skip = check_skip_len(nand, offset, *length); + if (need_skip < 0) { printf ("Attempt to write outside the flash area\n"); + *length = 0; return -EINVAL; } - if (len_incl_bad == *length) { + if (!need_skip) { rval = nand_write (nand, offset, length, buffer); - if (rval != 0) - printf ("NAND write to offset %llx failed %d\n", - offset, rval); + if (rval == 0) + return 0; + *length = 0; + printf ("NAND write to offset %llx failed %d\n", + offset, rval); return rval; } @@ -553,20 +578,28 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, { int rval; size_t left_to_read = *length; - size_t len_incl_bad; u_char *p_buffer = buffer; + int need_skip; - len_incl_bad = get_len_incl_bad (nand, offset, *length); + if ((offset & (nand->writesize - 1)) != 0) { + printf ("Attempt to read non page aligned data\n"); + *length = 0; + return -EINVAL; + } - if ((offset + len_incl_bad) > nand->size) { + need_skip = check_skip_len(nand, offset, *length); + if (need_skip < 0) { printf ("Attempt to read outside the flash area\n"); + *length = 0; return -EINVAL; } - if (len_incl_bad == *length) { + if (!need_skip) { rval = nand_read (nand, offset, length, buffer); if (!rval || rval == -EUCLEAN) return 0; + + *length = 0; printf ("NAND read from offset %llx failed %d\n", offset, rval); return rval; -- 1.7.0.4

2 2

[U-Boot] [PATCH] nand/davinci: make sure ECC calculation has really started
by Wolfram Sang 09 Sep '10

09 Sep '10

Due to a register glitch (result code <4 might show up right after the start-calculation-bit was set), make sure the ECC has really started. See 1c3275b656045aff9a75bb2c9f3251af1043ebb3 in the kernel. Signed-off-by: Wolfram Sang <w.sang(a)pengutronix.de> Cc: Sandeep Paulraj <s-paulraj(a)ti.com> --- drivers/mtd/nand/davinci_nand.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 4ca738e..c5a86d6 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -484,7 +484,20 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat, __raw_writel(1 << 13, &davinci_emif_regs->nandfcr); /* - * Wait for the corr_state field (bits 8 to 11)in the + * Wait for the corr_state field (bits 8 to 11) in the + * NAND Flash Status register to be not equal to 0x0, 0x1, 0x2, or 0x3. + * Otherwise ECC calculation has not even begun and the next loop might + * fail because of a false positive! + */ + i = NAND_TIMEOUT; + do { + val = __raw_readl(&davinci_emif_regs->nandfsr); + val &= 0xc00; + i--; + } while ((i > 0) && !val); + + /* + * Wait for the corr_state field (bits 8 to 11) in the * NAND Flash Status register to be equal to 0x0, 0x1, 0x2, or 0x3. */ i = NAND_TIMEOUT; -- 1.7.1

2 1

[U-Boot] [PATCH v2 3/5] nand erase: .spread, .part, .chip subcommands
by Scott Wood 09 Sep '10

09 Sep '10

A while back, in http://lists.denx.de/pipermail/u-boot/2009-June/054428.html, Michele De Candia posted a patch to not count bad blocks toward the requested size to be erased. This is desireable when you're passing in something like $filesize, but not when you're trying to erase a partition. Thus, a .spread subcommand (named for consistency with http://lists.denx.de/pipermail/u-boot/2010-August/075163.html) is introduced to make explicit the user's desire to erase for a given amount of data, rather than to erase a specific region of the chip. While passing $filesize to "nand erase" is useful, accidentally passing something like $fliesize currently produces quite unpleasant results, as the variable evaluates to nothing and U-Boot assumes that you want to erase the entire rest of the chip/partition. To improve the safety of the erase command, require the user to make explicit their intentions by using a .part or .chip subcommand. This is an incompatible user interface change, but keeping compatibility would eliminate the safety gain, and IMHO it's worth it. While touching nand_erase_opts(), make it accept 64-bit offsets and sizes, fix the percentage display when erase length is rounded up, eliminate an inconsistent warning about rounding up the erase length which only happened when the length was less than one block (rounding up for $filesize is normal operation), and add a diagnostic if there's an attempt to erase beginning at a non-block boundary. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- Fixed a minor whitespace issue pointed out by Ben Gardiner. common/cmd_nand.c | 44 ++++++++++++++++++++++++++++++++++++----- drivers/mtd/nand/nand_util.c | 31 ++++++++++++++++------------- include/nand.h | 7 ++++- 3 files changed, 60 insertions(+), 22 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 41aaf7f..dcccc19 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -449,14 +449,40 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) * 0 1 2 3 4 * nand erase [clean] [off size] */ - if (strcmp(cmd, "erase") == 0 || strcmp(cmd, "scrub") == 0) { + if (strncmp(cmd, "erase", 5) == 0 || strncmp(cmd, "scrub", 5) == 0) { nand_erase_options_t opts; /* "clean" at index 2 means request to write cleanmarker */ int clean = argc > 2 && !strcmp("clean", argv[2]); int o = clean ? 3 : 2; - int scrub = !strcmp(cmd, "scrub"); + int scrub = !strncmp(cmd, "scrub", 5); + int part = 0; + int chip = 0; + int spread = 0; + int args = 2; + + if (cmd[5] != 0) { + if (!strcmp(&cmd[5], ".spread")) { + spread = 1; + } else if (!strcmp(&cmd[5], ".part")) { + part = 1; + args = 1; + } else if (!strcmp(&cmd[5], ".chip")) { + chip = 1; + args = 0; + } else { + goto usage; + } + } + + /* + * Don't allow missing arguments to cause full chip/partition + * erases -- easy to do accidentally, e.g. with a misspelled + * variable name. + */ + if (argc != o + args) + goto usage; - printf("\nNAND %s: ", scrub ? "scrub" : "erase"); + printf("\nNAND %s: ", cmd); /* skip first two or three arguments, look for offset and size */ if (arg_off_size(argc - o, argv + o, &dev, &off, &size) != 0) return 1; @@ -468,6 +494,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) opts.length = size; opts.jffs2 = clean; opts.quiet = quiet; + opts.spread = spread; if (scrub) { puts("Warning: " @@ -648,11 +675,16 @@ U_BOOT_CMD( "nand write - addr off|partition size\n" " read/write 'size' bytes starting at offset 'off'\n" " to/from memory address 'addr', skipping bad blocks.\n" - "nand erase [clean] [off size] - erase 'size' bytes from\n" - " offset 'off' (entire device if not specified)\n" + "nand erase[.spread] [clean] [off [size]] - erase 'size' bytes " + "from offset 'off'\n" + " With '.spread', erase enough for given file size, otherwise,\n" + " 'size' includes skipped bad blocks.\n" + "nand erase.part [clean] partition - erase entire mtd partition'\n" + "nand erase.chip [clean] - erase entire chip'\n" "nand bad - show bad blocks\n" "nand dump[.oob] off - dump page\n" - "nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n" + "nand scrub off size | scrub.part partition | scrub.chip\n" + " really clean NAND erasing bad blocks (UNSAFE)\n" "nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n" "nand biterr off - make a bit error at offset (UNSAFE)" #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 0f67790..6a5dd37 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -75,7 +75,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) { struct jffs2_unknown_node cleanmarker; erase_info_t erase; - ulong erase_length; + unsigned long erase_length, erased_length; /* in blocks */ int bbtest = 1; int result; int percent_complete = -1; @@ -84,13 +84,19 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) struct mtd_oob_ops oob_opts; struct nand_chip *chip = meminfo->priv; + if ((opts->offset & (meminfo->writesize - 1)) != 0) { + printf("Attempt to erase non page aligned data\n"); + return -1; + } + memset(&erase, 0, sizeof(erase)); memset(&oob_opts, 0, sizeof(oob_opts)); erase.mtd = meminfo; erase.len = meminfo->erasesize; erase.addr = opts->offset; - erase_length = opts->length; + erase_length = lldiv(opts->length + meminfo->erasesize - 1, + meminfo->erasesize); cleanmarker.magic = cpu_to_je16 (JFFS2_MAGIC_BITMASK); cleanmarker.nodetype = cpu_to_je16 (JFFS2_NODETYPE_CLEANMARKER); @@ -114,15 +120,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) priv_nand->bbt = NULL; } - if (erase_length < meminfo->erasesize) { - printf("Warning: Erase size 0x%08lx smaller than one " \ - "erase block 0x%08x\n",erase_length, meminfo->erasesize); - printf(" Erasing 0x%08x instead\n", meminfo->erasesize); - erase_length = meminfo->erasesize; - } - - for (; - erase.addr < opts->offset + erase_length; + for (erased_length = 0; + erased_length < erase_length; erase.addr += meminfo->erasesize) { WATCHDOG_RESET (); @@ -135,6 +134,10 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) "0x%08llx " " \n", erase.addr); + + if (!opts->spread) + erased_length++; + continue; } else if (ret < 0) { @@ -145,6 +148,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) } } + erased_length++; + result = meminfo->erase(meminfo, &erase); if (result != 0) { printf("\n%s: MTD Erase failure: %d\n", @@ -171,9 +176,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) } if (!opts->quiet) { - unsigned long long n =(unsigned long long) - (erase.addr + meminfo->erasesize - opts->offset) - * 100; + unsigned long long n = erased_length * 100ULL; int percent; do_div(n, erase_length); diff --git a/include/nand.h b/include/nand.h index 8bdf419..a452411 100644 --- a/include/nand.h +++ b/include/nand.h @@ -98,13 +98,16 @@ struct nand_read_options { typedef struct nand_read_options nand_read_options_t; struct nand_erase_options { - ulong length; /* number of bytes to erase */ - ulong offset; /* first address in NAND to erase */ + loff_t length; /* number of bytes to erase */ + loff_t offset; /* first address in NAND to erase */ int quiet; /* don't display progress messages */ int jffs2; /* if true: format for jffs2 usage * (write appropriate cleanmarker blocks) */ int scrub; /* if true, really clean NAND by erasing * bad blocks (UNSAFE) */ + + /* Don't include skipped bad blocks in size to be erased */ + int spread; }; typedef struct nand_erase_options nand_erase_options_t; -- 1.7.0.4

1 0

[U-Boot] [PULL] u-boot-arm.git
by Wolfgang Denk 09 Sep '10

09 Sep '10

The following changes since commit f91506e28387fece392b5dd3bb3aa309e4ce7e4d: Merge branch 'master' of /home/wd/git/u-boot/master (2010-09-07 22:19:49 +0200) are available in the git repository at: git://git.denx.de/u-boot-arm.git master Albert Aribaud (2): Orion5x: bugfix: window size (mis)calculation orion5x: fix comment-in-comment typo in cpu.h Alexander Stein (1): at91_pit: Fix AT91_PIT_MR_PIV_MASK macro Daniel Gorsulowski (3): at91: Defined main clock frequency on esd at91 boards at91: Update meesc board to new SoC access at91: Enabeling USB host on meesc board Eric BÃ©nard (2): cpuat91: convert to new at91 soc architecture cpuat91: update defaut environement Haavard Skinnemoen (3): avr32: Print unrelocated PC on exception avr32: Use uncached() macro to get an address for SDRAM init avr32: Add simple paging support Jens Scharsig (1): AT91 Fix: return value of get_tbclk Mans Rullgard (3): ARMV7: OMAP3: Fix and clean up L2 cache enable/disable functions ARMV7: OMAP3: Convert setup_auxcr() to pure asm ARMV7: OMAP3: Apply Cortex-A8 errata workarounds only on affected revisions Minkyu Kang (9): S5P: mmc: use the standard debug macro S5P: Use accessor functions instead of SoC specific defines to access the base address ARMV7: S5P: make s5p-common for sharing the code between s5pc1xx and s5pc2xx ARMV7: S5P: rename from s5pc1xx to s5p S5P: mmc: fix the mmc offset ARMV7: S5P: rename from CONFIG_S5PC1XX to CONFIG_S5P ARMV7: S5P: fix the macro at samsung_get_base function ARMV7: S5P: separate the peripheral clocks ARMV7: S5P: rename the member of gpio structure Prafulla Wadaskar (1): Kirkwood: bugfix: window size (mis)calculation Reinhard Meyer (7): AT91: MCI: add SD/MMC driver using mmc framework AT91: add RTT and GPBR based RTC AT91SAM9XE: add embedded flash support AT91: fix at91sam9260.h for AT91SAM9XE AT91: reset.c: fix comments, add option AT91/AVR32: atmel_spi.c: flush RDR before next SPI transaction AT91: add option to enable pullups in at91sam9260_devices.c Ricardo Salveti de Araujo (1): ARMV7: Fix pad mux for Panda LEDs Stefano Babic (1): MX51: Update responsible for mx51evk Steve Sakoman (15): ARMV7: OMAP: Move syslib.c to omap-common since it can be shared by OMAP3 and OMAP4 ARMV7: OMAP: add convenience function to set TWL4030 regulator voltages ARMV7: OMAP: Enable input driver on Overo's MMC1_CLK and MMC3_CLK pinmux setup ARMV7: OMAP: Add mpurate boot arg for Overo and Beagle ARMV7: OMAP: Add board revision detection for Overo ARMV7: OMAP: Add detection and support for Beagle C4 revision ARMV7: OMAP: Configure Overo's second network chip ARMV7: OMAP3: Update CPU type detection for AM35XX/OMAP36XX/37XX ARMV7: OMAP3: Add clock setup for OMAP36XX/37XX ARMV7: OMAP3: Fix broken reset command on OMAP36XX/37XX and OMAP4 ARMV7: OMAP3: Remove erroneous hard coded sdram setup for 128MB/bank mtd: nand: supress 'unknown NAND' warning if no nand is found ARMV7: OMAP3: Add CONFIG_SYS_NAND_QUIET_TEST to Beagle and Overo configs ARMV7: OMAP3: Add support for Beagle xM ARMV7: OMAP: Overo: Autodetect presence/absence of transceiver on mmc2 Wolfgang Denk (5): Merge branch 'master' of git://git.denx.de/u-boot-marvell Merge branch 'master' of git://git.denx.de/u-boot-samsung Merge branch 'at91' of git://git.denx.de/u-boot-atmel Merge branch 'avr32' of git://git.denx.de/u-boot-atmel Merge branch 'master' of git://git.denx.de/u-boot-ti MAINTAINERS | 5 +- Makefile | 9 +- arch/arm/cpu/arm926ejs/at91/Makefile | 1 + arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 56 ++- arch/arm/cpu/arm926ejs/at91/eflash.c | 271 ++++++++++ arch/arm/cpu/arm926ejs/at91/reset.c | 21 +- arch/arm/cpu/arm926ejs/at91/timer.c | 5 +- arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 +- arch/arm/cpu/arm926ejs/orion5x/cpu.c | 2 +- arch/arm/cpu/armv7/omap-common/Makefile | 2 + arch/arm/cpu/armv7/omap-common/reset.S | 4 +- arch/arm/cpu/armv7/{omap3 => omap-common}/syslib.c | 2 - arch/arm/cpu/armv7/omap3/Makefile | 1 - arch/arm/cpu/armv7/omap3/board.c | 35 -- arch/arm/cpu/armv7/omap3/cache.S | 101 ++-- arch/arm/cpu/armv7/omap3/clock.c | 549 ++++++++++++++------ arch/arm/cpu/armv7/omap3/lowlevel_init.S | 69 +++ arch/arm/cpu/armv7/omap3/sdrc.c | 43 +- arch/arm/cpu/armv7/omap3/sys_info.c | 147 +++++- arch/arm/cpu/armv7/s5p-common/Makefile | 46 ++ .../cpu/armv7/{s5pc1xx => s5p-common}/cpu_info.c | 11 +- arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/timer.c | 23 +- arch/arm/cpu/armv7/s5pc1xx/Makefile | 2 - arch/arm/cpu/armv7/s5pc1xx/clock.c | 51 ++- arch/arm/cpu/armv7/s5pc1xx/reset.S | 2 +- arch/arm/cpu/armv7/s5pc1xx/sromc.c | 8 +- arch/arm/include/asm/arch-at91/at91_common.h | 1 + arch/arm/include/asm/arch-at91/at91_dbu.h | 41 ++ arch/arm/include/asm/arch-at91/at91_eefc.h | 51 ++ arch/arm/include/asm/arch-at91/at91_gpbr.h | 45 ++ arch/arm/include/asm/arch-at91/at91_pit.h | 2 +- arch/arm/include/asm/arch-at91/at91_rtt.h | 36 ++ arch/arm/include/asm/arch-at91/at91sam9260.h | 18 +- arch/arm/include/asm/arch-at91/clk.h | 5 + arch/arm/include/asm/arch-at91/hardware.h | 1 + arch/arm/include/asm/arch-omap3/clocks.h | 17 + arch/arm/include/asm/arch-omap3/clocks_omap3.h | 27 + arch/arm/include/asm/arch-omap3/cpu.h | 15 +- arch/arm/include/asm/arch-omap3/omap3.h | 32 ++- arch/arm/include/asm/arch-omap3/sys_proto.h | 2 + arch/arm/include/asm/arch-omap4/omap4.h | 1 + arch/arm/include/asm/arch-omap4/sys_proto.h | 3 + arch/arm/include/asm/arch-orion5x/cpu.h | 2 +- arch/arm/include/asm/arch-s5pc1xx/clk.h | 5 +- arch/arm/include/asm/arch-s5pc1xx/cpu.h | 39 ++- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 172 +++--- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- arch/arm/include/asm/arch-s5pc1xx/pwm.h | 12 +- arch/avr32/cpu/at32ap700x/Makefile | 2 +- arch/avr32/cpu/at32ap700x/mmu.c | 78 +++ arch/avr32/cpu/exception.c | 3 +- arch/avr32/cpu/start.S | 19 +- arch/avr32/include/asm/arch-at32ap700x/addrspace.h | 5 +- arch/avr32/include/asm/arch-at32ap700x/mmu.h | 66 +++ arch/avr32/lib/board.c | 4 + board/atmel/atngw100/atngw100.c | 19 +- board/atmel/atstk1000/atstk1000.c | 19 +- board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 19 +- board/esd/meesc/meesc.c | 116 +++-- board/eukrea/cpuat91/cpuat91.c | 53 +-- board/mimc/mimc200/mimc200.c | 24 +- board/miromico/hammerhead/hammerhead.c | 19 +- board/overo/overo.c | 105 ++++- board/overo/overo.h | 47 ++- board/samsung/goni/goni.c | 8 +- board/samsung/goni/lowlevel_init.S | 6 +- board/samsung/smdkc100/lowlevel_init.S | 2 +- board/samsung/smdkc100/onenand.c | 3 +- board/samsung/smdkc100/smdkc100.c | 4 +- board/ti/beagle/beagle.c | 102 +++-- board/ti/beagle/beagle.h | 40 ++- board/ti/panda/panda.h | 44 +- common/serial.c | 4 +- doc/README.atmel_mci | 86 +++ drivers/gpio/Makefile | 2 +- drivers/mmc/Makefile | 5 +- drivers/mmc/atmel_mci.h | 48 ++- drivers/mmc/gen_atmel_mci.c | 353 +++++++++++++ drivers/mmc/s5p_mmc.c | 36 +- drivers/mtd/nand/nand_base.c | 9 +- drivers/mtd/onenand/samsung.c | 6 +- drivers/power/twl4030.c | 69 ++-- drivers/rtc/Makefile | 1 + drivers/rtc/at91sam9_rtt.c | 100 ++++ drivers/serial/Makefile | 2 +- drivers/serial/serial_s5p.c | 10 +- drivers/spi/atmel_spi.c | 13 +- include/configs/atngw100.h | 3 + include/configs/atstk1002.h | 3 + include/configs/atstk1003.h | 3 + include/configs/atstk1004.h | 3 + include/configs/atstk1006.h | 3 + include/configs/cpuat91.h | 53 ++- include/configs/favr-32-ezkit.h | 3 + include/configs/hammerhead.h | 3 + include/configs/meesc.h | 26 +- include/configs/mimc200.h | 3 + include/configs/omap3_beagle.h | 4 + include/configs/omap3_overo.h | 4 + include/configs/otc570.h | 1 + include/configs/s5p_goni.h | 2 +- include/configs/smdkc100.h | 2 +- include/mmc.h | 15 +- include/serial.h | 2 +- include/twl4030.h | 14 + 105 files changed, 2900 insertions(+), 795 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/at91/eflash.c rename arch/arm/cpu/armv7/{omap3 => omap-common}/syslib.c (97%) create mode 100644 arch/arm/cpu/armv7/s5p-common/Makefile rename arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/cpu_info.c (83%) rename arch/arm/cpu/armv7/{s5pc1xx => s5p-common}/timer.c (86%) create mode 100644 arch/arm/include/asm/arch-at91/at91_dbu.h create mode 100644 arch/arm/include/asm/arch-at91/at91_eefc.h create mode 100644 arch/arm/include/asm/arch-at91/at91_gpbr.h create mode 100644 arch/arm/include/asm/arch-at91/at91_rtt.h create mode 100644 arch/avr32/cpu/at32ap700x/mmu.c create mode 100644 arch/avr32/include/asm/arch-at32ap700x/mmu.h create mode 100644 doc/README.atmel_mci create mode 100644 drivers/mmc/gen_atmel_mci.c create mode 100644 drivers/rtc/at91sam9_rtt.c 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 At the source of every error which is blamed on the computer you will find at least two human errors, including the error of blaming it on the computer.

1 0

[U-Boot] [PATCH v2] cp/cmp: Add WATCHDOG_RESET in copy and compare loop
by Stefan Roese 09 Sep '10

09 Sep '10

On some boards with a very short watchdog timeout, the "cp" and "cmp" commands may reset the board. This patch adds some watchdog resets inside the loops. Otherwise for example the lwmon5 board will reset while doing something like this: => cp.b fc000000 1000000 100000 Signed-off-by: Stefan Roese <sr(a)denx.de> --- v2: - Changed to power of 2 value to simplify the resulting code, 4096 seems to be enough for lwmon5. common/cmd_mem.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 44834ea..c426997 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -337,6 +337,10 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ngood++; addr1 += size; addr2 += size; + + /* reset watchdog from time to time */ + if ((count % 4096) == 0) + WATCHDOG_RESET(); } printf("Total of %ld %s%s were the same\n", @@ -447,6 +451,10 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) *((u_char *)dest) = *((u_char *)addr); addr += size; dest += size; + + /* reset watchdog from time to time */ + if ((count % 4096) == 0) + WATCHDOG_RESET(); } return 0; } -- 1.7.2.2

2 2