February 2009 - U-Boot

[U-Boot] ppc4xx: u-boot sees PCIe endpoint, linux does not.
by Leon Woestenberg 09 Mar '09

09 Mar '09

Hello, AMCC PPC460EX canyonlands board with an FPGA PCIe end point: u-boot sees the end point, but Linux does not: U-Boot 1.3.3-00249-ga524e11 (Jun 30 2008 - 16:05:51) CPU: AMCC PowerPC 460EX Rev. A at 800 MHz (PLB=200, OPB=100, EBC=100 MHz) <...> Board: Canyonlands - AMCC PPC460EX Evaluation Board, 2*PCIe, Rev. 16 <...> PCIE1: successfully set as root-complex 02 00 2071 2071 00ff 00 Now, if I re-program the end-point FPGA during the u-boot boot time-out, Linux will recognize the end-point. Any takers on what I should start looking for? Regards, -- Leon

3 4

[U-Boot] [PATCH] Fix OneNAND ipl to read 256KB
by Rohit Hagargundgi 09 Mar '09

09 Mar '09

Currently OneNAND initial program loader (ipl) reads only block 0. However, u-boot image for apollon board is 195KB making the board unbootable with OneNAND. Fix ipl to read 256KB. Signed-off-by: Rohit Hagargundgi <h.rohit(a)samsung.com> --- onenand_ipl/onenand_ipl.h | 1 + onenand_ipl/onenand_read.c | 29 +++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/onenand_ipl/onenand_ipl.h b/onenand_ipl/onenand_ipl.h index 3387998..f96e88a 100644 --- a/onenand_ipl/onenand_ipl.h +++ b/onenand_ipl/onenand_ipl.h @@ -24,6 +24,7 @@ #include <linux/mtd/onenand_regs.h> #define ONENAND_BLOCK_SIZE 2048 +#define ONENAND_BOOTLOADER_SIZE 0x40000 #ifndef CONFIG_SYS_PRINTF #define printf(format, args...) diff --git a/onenand_ipl/onenand_read.c b/onenand_ipl/onenand_read.c index 6d04943..33c66ff 100644 --- a/onenand_ipl/onenand_read.c +++ b/onenand_ipl/onenand_read.c @@ -72,6 +72,13 @@ static inline int onenand_read_page(ulong block, ulong page, while (!(READ_INTERRUPT() & ONENAND_INT_READ)) continue; + /* Check for invalid block mark*/ + if (page < 2) { + unsigned int mark = onenand_readw(THIS_ONENAND(ONENAND_SPARERAM)); + if (mark != 0xffff) + return 1; + } + #ifdef __HAVE_ARCH_MEMCPY32 /* 32 bytes boundary memory copy */ memcpy32(buf, base, pagesize); @@ -94,21 +101,27 @@ static inline int onenand_read_page(ulong block, ulong page, */ int onenand_read_block0(unsigned char *buf) { - int page, offset = 0; + int block = 0, page, offset = 0; int pagesize = ONENAND_PAGE_SIZE; + int nblocks = ONENAND_BOOTLOADER_SIZE / (ONENAND_PAGES_PER_BLOCK * ONENAND_PAGE_SIZE); /* MLC OneNAND has 4KiB page size */ - if (onenand_readw(THIS_ONENAND(ONENAND_REG_TECHNOLOGY))) + if (onenand_readw(THIS_ONENAND(ONENAND_REG_TECHNOLOGY))) { pagesize <<= 1; + nblocks >>= 1; + } /* NOTE: you must read page from page 1 of block 0 */ /* read the block page by page*/ - for (page = ONENAND_START_PAGE; - page < ONENAND_PAGES_PER_BLOCK; page++) { - - onenand_read_page(0, page, buf + offset, pagesize); - offset += pagesize; - } + for (page = ONENAND_START_PAGE; block < nblocks; page = 0, block++) + for (; page < ONENAND_PAGES_PER_BLOCK; page++) { + if (onenand_read_page(block, page, buf + offset, pagesize)) { + /* This block is bad. Skip it and read next block */ + nblocks++; + break; + } + offset += pagesize; + } return 0; } -- 1.6.0.6

5 13

[U-Boot] [PATCH 0/2] at91sam9: add watchdog support
by Jean-Christophe PLAGNIOL-VILLARD 09 Mar '09

09 Mar '09

This patch series will introduce the AT91SAM9 watchdog support but becare aware that the watchdog can only be activate once so you need to activate in the bootloader and in the bootstrap if you use it Best Regards, J.

2 8

[U-Boot] [PATCH v2 3/4] JFFS2 commands support for Flex-OneNAND
by Rohit Hagargundgi 08 Mar '09

08 Mar '09

Add sanity check for the partitions. Some special cases handled by the check are: - A partition can span across erase regions. - A region can have odd number of blocks. Signed-off-by: Rohit Hagargundgi <h.rohit(a)samsung.com> --- common/cmd_jffs2.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 791a572..5d2d69c 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -421,17 +421,70 @@ static int part_validate_onenand(struct mtdids *id, struct part_info *part) #if defined(CONFIG_CMD_ONENAND) /* info for OneNAND chips */ struct mtd_info *mtd; + int erasesize = 0; mtd = &onenand_mtd; - if ((unsigned long)(part->offset) % mtd->erasesize) { - printf("%s%d: partition (%s) start offset" - "alignment incorrect\n", - MTD_DEV_TYPE(id->type), id->num, part->name); - return 1; + if (mtd->numeraseregions > 1) { + int i, rgn, max = mtd->numeraseregions; + unsigned end = part->offset + part->size; + struct mtd_erase_region_info *regions = mtd->eraseregions; + unsigned portion_start, portion_end, region_end; + + /* Find the first erase regions which is part of this + * partition. + */ + i = flexonenand_region(mtd, part->offset); + + /* Partition offset within region must align + * on region's erase size + */ + if ((part->offset - regions[i].offset) % regions[i].erasesize) { + printf("%s%d: partition (%s) doesn't start on an erase" + " block boundary\n", MTD_DEV_TYPE(id->type), + id->num, part->name); + return 1; + } + + erasesize = regions[i].erasesize; + + /* A partition spanning across multiple erase regions has + * erase size equal to greatest erase size among the regions. + */ + rgn = i; + for (; i < max && regions[i].offset < end; i++) + if (erasesize < regions[i].erasesize) + erasesize = regions[i].erasesize; + + /* If partition spans many erase regions, + * the partition portion present in each region + * should be multiple of biggest erase size + */ + for (i = rgn; i < max && regions[i].offset < end; i++) { + portion_start = max(regions[i].offset, part->offset); + region_end = regions[i].offset + + regions[i].erasesize * regions[i].numblocks; + portion_end = min(end, region_end); + + if ((portion_end - portion_start) % erasesize) { + printf("%s%d: partition (%s) is not erase block" + " aligned within erase region\n", + MTD_DEV_TYPE(id->type), id->num, part->name); + return 1; + } + } + } else { + /* Single erase size */ + erasesize = mtd->erasesize; + if ((unsigned long)(part->offset) % erasesize) { + printf("%s%d: partition (%s) start offset" + "alignment incorrect\n", + MTD_DEV_TYPE(id->type), id->num, part->name); + return 1; + } } - if (part->size % mtd->erasesize) { + if (part->size % erasesize) { printf("%s%d: partition (%s) size alignment incorrect\n", MTD_DEV_TYPE(id->type), id->num, part->name); return 1; -- 1.5.4.3

1 1

[U-Boot] [PATCH v2 2/4] Environment support for Flex-OneNAND
by Rohit Hagargundgi 08 Mar '09

08 Mar '09

Define and use CONFIG_ENV_ADDR_FLEX and CONFIG_ENV_SIZE_FLEX for storing environment variables. Signed-off-by: Rohit Hagargundgi <h.rohit(a)samsung.com> --- common/env_onenand.c | 10 ++++++++++ include/configs/apollon.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/common/env_onenand.c b/common/env_onenand.c index dbccc79..cd44781 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -58,11 +58,14 @@ uchar env_get_char_spec(int index) void env_relocate_spec(void) { + struct onenand_chip *this = &onenand_chip; unsigned long env_addr; int use_default = 0; size_t retlen; env_addr = CONFIG_ENV_ADDR; + if (FLEXONENAND(this)) + env_addr = CONFIG_ENV_ADDR_FLEX; /* Check OneNAND exist */ if (onenand_mtd.writesize) @@ -89,6 +92,7 @@ void env_relocate_spec(void) int saveenv(void) { + struct onenand_chip *this = &onenand_chip; unsigned long env_addr = CONFIG_ENV_ADDR; struct erase_info instr = { .callback = NULL, @@ -96,6 +100,12 @@ int saveenv(void) size_t retlen; instr.len = CONFIG_ENV_SIZE; + if (FLEXONENAND(this)) { + env_addr = CONFIG_ENV_ADDR_FLEX; + instr.len = CONFIG_ENV_SIZE_FLEX; + instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ? + 1 : 0; + } instr.addr = env_addr; instr.mtd = &onenand_mtd; if (onenand_erase(&onenand_mtd, &instr)) { diff --git a/include/configs/apollon.h b/include/configs/apollon.h index dff47fc..0fcb22b 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -76,6 +76,7 @@ * Size of malloc() pool */ #define CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */ +#define CONFIG_ENV_SIZE_FLEX SZ_256K #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) /* bytes reserved for initial data */ #define CONFIG_SYS_GBL_DATA_SIZE 128 @@ -256,6 +257,7 @@ #define CONFIG_SYS_ONENAND_BASE 0x00000000 #define CONFIG_ENV_IS_IN_ONENAND 1 #define CONFIG_ENV_ADDR 0x00020000 +#define CONFIG_ENV_ADDR_FLEX 0x00040000 #ifdef CONFIG_SYS_USE_UBI #define CONFIG_JFFS2_CMDLINE -- 1.5.4.3

1 1

[U-Boot] [PATCH] NIOS2: Added DE2 board with SD support
by ivanchuklist ivanchu 08 Mar '09

08 Mar '09

Hi list, I wrote about my work with u-boot in the thread "[U-Boot] DE2 board with MMC interface (PIO based) and FAT support enabled" and i decided to post a patch. I would like to discuss the changes. I have changed the Makefile to match the binutils provided by Altera and i added the DE2 board. I have also made changes to the files cmd_mem.c to add one more command "dmmc". Because the SD card is not a memory mapped device in the bus like a flash memory, we can't deduce the direction of data (i mean when copying data to sd or from sd) with the function mmc2info(). I tried to solve this trick by using the command dmmc. I found problems at link level with cmd_mmc.o and cmd_mem.o because both files includes mmc.h, then i have two copies of the same functions in both objects files. I solved this problem by declaring extern the function mmc_init in cmd_mmc.c. I think i should post the file include/asm-nios2/arch-nios2/mmc.h and the board related files but i will wait your response. In include/asm-nios2/arch-nios2/mmc.h i implemented mmc_get_dev() and mmc_read_block() to provide access to the FAT table. The code is working with all the examples distributed by Altera in the DE2 board and it should work with any SD socket interfaced by PIO cores. diff --git a/Makefile b/Makefile index 4df4812..6501d08 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ ifeq ($(ARCH),nios) CROSS_COMPILE = nios-elf- endif ifeq ($(ARCH),nios2) -CROSS_COMPILE = nios2-elf- +CROSS_COMPILE = nios2-linux- endif ifeq ($(ARCH),m68k) CROSS_COMPILE = m68k-elf- @@ -3137,6 +3137,9 @@ PK1C20_config : unconfig PCI5441_config : unconfig @$(MKCONFIG) PCI5441 nios2 nios2 pci5441 psyent +DE2_config : unconfig + @$(MKCONFIG) DE2 nios2 nios2 de2 altera + #======================================================================== ## Microblaze #======================================================================== diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 400cfd7..4585795 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -53,6 +53,7 @@ uint dp_last_length = 0x40; uint mm_last_addr, mm_last_size; static ulong base_address = 0; +static ulong mmc_direction = 0; /* Memory Display * @@ -355,6 +356,17 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return rcode; } +int do_dmmc( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + if (argc > 1) + mmc_direction = simple_strtoul(argv[1], NULL, 10); + if (mmc_direction) + printf("Mem to mmc\n"); + else + printf("Mmc to mem\n"); + return 0; +} + int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { ulong addr, dest, count; @@ -405,7 +417,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif #if defined(CONFIG_CMD_MMC) - if (mmc2info(dest)) { + if (mmc_direction) { int rc; puts ("Copy to MMC... "); @@ -422,9 +434,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } puts ("done\n"); return 0; - } - - if (mmc2info(addr)) { + } else { int rc; puts ("Copy from MMC... "); @@ -1221,6 +1231,14 @@ U_BOOT_CMD( "[.b, .w, .l] address value [count]\n - write memory\n" ); +#if defined(CONFIG_CMD_MMC) +U_BOOT_CMD( + dmmc, 2, 1, do_dmmc, + "dmmc - set mmc-memory copy direction\n", + "direction\n - copy mmc<->mem\n" +); +#endif + U_BOOT_CMD( cp, 4, 1, do_mem_cp, "cp - memory copy\n", diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 25c9702..c9a5ac6 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -23,7 +23,8 @@ #include <common.h> #include <command.h> -#include <mmc.h> + +extern int mmc_init(int); int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { @@ -31,6 +32,7 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) printf ("No MMC card found\n"); return 1; } + printf ("MMC card found\n"); return 0; }

2 1

[U-Boot] [PATCH] fsl: Don't spew messages related to PHY fixup of device tree
by Kumar Gala 07 Mar '09

07 Mar '09

Converted print statements that didn't have much meaning beyond debug from printf() to debug(). Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- board/freescale/common/sgmii_riser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c index aeacb91..9326360 100644 --- a/board/freescale/common/sgmii_riser.c +++ b/board/freescale/common/sgmii_riser.c @@ -47,7 +47,7 @@ void fsl_sgmii_riser_fdt_fixup(void *fdt) const char *model; const char *path; - printf("Updating PHY address for %s\n", dev->name); + debug("Updating PHY address for %s\n", dev->name); if (!strstr(dev->name, "eTSEC")) continue; @@ -64,7 +64,7 @@ void fsl_sgmii_riser_fdt_fixup(void *fdt) model = fdt_getprop(fdt, enet_node, "model", NULL); - printf("%s's model is %s\n", enet, model); + debug("%s's model is %s\n", enet, model); /* * We only want to do this to eTSECs. On some platforms * there are more than one type of gianfar-style ethernet @@ -84,7 +84,7 @@ void fsl_sgmii_riser_fdt_fixup(void *fdt) priv = dev->priv; - printf("Device flags are %x\n", priv->flags); + debug("Device flags are %x\n", priv->flags); if (priv->flags & TSEC_SGMII) fdt_setprop_cell(fdt, phynode, "reg", priv->phyaddr); } -- 1.5.6.6

2 1

Re: [U-Boot-Users] NAND boot from file
by Charles Krinke 06 Mar '09

06 Mar '09

Dear Wolfgang: >Um... if this is JFFS2, then why not simply "fsload" + "bootm" ? Although I can format the flash in Linux and run fsinfo, ls or fsload in u-boot, there is a time of several minutes after Scanning JFFS2 FS Before ls can find the directory or fsload can attempt to load the uImage file. I am thinking that the 'flash_eraseall -j' command I am using may not be quite setup correctly with the u-boot environment. It should not take several minutes to pull a directory off a formatted flash. Here is what I do: Linux# flash_eraseall -j /dev/mtd0 Linux# mount -t jffs2 /dev/mtdblock0 /mnt/flash1 Linux# cp /uImage /mnt/flash1 Linux# ls /mnt/flash1 uImage is here, now reboot uboot> ls uImage is here, but it takes several minutes to get the listing. Fsload takes several minutes also. Can you think of what other assumptions I may be making that may be invalid? Charles

3 2

[U-Boot] [PATCH 7/7 v4] 8360, kmeter1: added bootcount feature.
by Heiko Schocher 06 Mar '09

06 Mar '09

add CONFIG_BOOTCOUNT_LIMIT feature for 8360 CPU. The bootcounter uses 8 bytes from the muram, because no other memory was found on this CPU for the bootcount feature. So we must correct the muram size in DTS before booting Linux. This feature is actual only implemented for MPC8360, because not all 83xx CPU have qe, and therefore no muram, which this feature uses. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- cpu/mpc83xx/cpu.c | 34 ++++++++++++++++++++++++++++++++++ cpu/mpc83xx/fdt.c | 18 ++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 9e0a05d..876f5c7 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -35,6 +35,10 @@ #include <tsec.h> #include <netdev.h> #include <fsl_esdhc.h> +#ifdef CONFIG_BOOTCOUNT_LIMIT +#include <asm/immap_qe.h> +#include <asm/io.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -399,3 +403,33 @@ int cpu_mmc_init(bd_t *bis) return 0; #endif } + +#ifdef CONFIG_BOOTCOUNT_LIMIT + +#if !defined(CONFIG_MPC8360) +#error "CONFIG_BOOTCOUNT_LIMIT only for MPC8360 implemented" +#endif + +#if !defined(CONFIG_BOOTCOUNT_ADDR) +#define CONFIG_BOOTCOUNT_ADDR (0x110000 + QE_MURAM_SIZE - 2 * sizeof(unsigned long)) +#endif + +#include <asm/io.h> + +void bootcount_store (ulong a) +{ + void *reg = (void *)(CONFIG_SYS_IMMR + CONFIG_BOOTCOUNT_ADDR); + out_be32 (reg, a); + out_be32 (reg + 4, BOOTCOUNT_MAGIC); +} + +ulong bootcount_load (void) +{ + void *reg = (void *)(CONFIG_SYS_IMMR + CONFIG_BOOTCOUNT_ADDR); + + if (in_be32 (reg + 4) != BOOTCOUNT_MAGIC) + return 0; + else + return in_be32 (reg); +} +#endif /* CONFIG_BOOTCOUNT_LIMIT */ diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c index f890775..4cc9047 100644 --- a/cpu/mpc83xx/fdt.c +++ b/cpu/mpc83xx/fdt.c @@ -32,6 +32,20 @@ extern void ft_qe_setup(void *blob); DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_BOOTCOUNT_LIMIT) && defined(CONFIG_MPC8360) +#include <asm/immap_qe.h> + +void fdt_fixup_muram (void *blob) +{ + ulong data[2]; + + data[0] = 0; + data[1] = QE_MURAM_SIZE - 2 * sizeof(unsigned long); + do_fixup_by_path(blob, "/qe/muram/data-only", "reg", + data, sizeof (data), 0); +} +#endif + void ft_cpu_setup(void *blob, bd_t *bd) { immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; @@ -83,4 +97,8 @@ void ft_cpu_setup(void *blob, bd_t *bd) #endif fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); + +#if defined(CONFIG_BOOTCOUNT_LIMIT) + fdt_fixup_muram (blob); +#endif } -- 1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH v3] MPC8349ITX: several config issues fixed
by Valeriy Glushkov 06 Mar '09

06 Mar '09

The previous version rebooted forever with DDR bigger than 256MB. Access the DS1339 RTC chip is on I2C1 bus. Allow DHCP. Signed-off-by: Valeriy Glushkov <gvv(a)lstec.com> --- include/configs/MPC8349ITX.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 14cbc45..f1b5566 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -98,6 +98,7 @@ #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_SYS_I2C2_OFFSET 0x3100 #define CONFIG_SYS_SPD_BUS_NUM 1 /* The I2C bus for SPD */ +#define CONFIG_SYS_RTC_BUS_NUM 1 /* The I2C bus for RTC */ #define CONFIG_SYS_I2C_8574_ADDR1 0x20 /* I2C1, PCF8574 */ #define CONFIG_SYS_I2C_8574_ADDR2 0x21 /* I2C1, PCF8574 */ @@ -158,6 +159,9 @@ #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL (DDR_SDRAM_CLK_CNTL_SS_EN | \ DDR_SDRAM_CLK_CNTL_CLK_ADJUST_075) +#define CONFIG_VERY_BIG_RAM +#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)256 << 20) + #ifdef CONFIG_HARD_I2C #define CONFIG_SPD_EEPROM /* use SPD EEPROM for DDR setup*/ #endif @@ -447,6 +451,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_CMD_IRQ #define CONFIG_CMD_NET #define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP #define CONFIG_CMD_SDRAM #ifdef CONFIG_COMPACT_FLASH -- 1.5.2.5

4 7