March 2011 - U-Boot

[U-Boot] [PATCH] NET: Correct potential missing goto label in case statement.
by Gray Remlin 28 Apr '11

28 Apr '11

If neither CONFIG_CMD_PING or CONFIG_CMD_SNTP are defined but CONFIG_CMD_DNS is, a compile-time error will occur due to the absence of a goto label. Signed-off-by: Gray Remlin <gryrmln(a)gmail.com> --- net/net.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/net.c b/net/net.c index a609632..e50bdf1 100644 --- a/net/net.c +++ b/net/net.c @@ -1724,7 +1724,8 @@ static int net_check_prereq (proto_t protocol) puts ("*** ERROR: `serverip' not set\n"); return (1); } -#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP) +#if defined(CONFIG_CMD_PING) || defined(CONFIG_CMD_SNTP) || \ + defined(CONFIG_CMD_DNS) common: #endif -- 1.7.4

2 1

[U-Boot] [PATCH] fix redundant environment for serial flash
by thomas.langer＠lantiq.com 28 Apr '11

28 Apr '11

This patch fixes problems in the handling of redundant environment in env_sf.c The major problem are double calls of free() on the allocated buffers, which damages the internal data of malloc and crashes on next call. In addition, the selection of the active environment had errors and compiler warnings, which are corrected by this patch. Signed-off-by: Thomas Langer <thomas.langer(a)lantiq.com> --- This patch is done and tested against the version 2010.12 and applies also cleanly against the u-boot/master. --- a/common/env_sf.c +++ b/common/env_sf.c @@ -59,7 +59,6 @@ DECLARE_GLOBAL_DATA_PTR; extern uchar default_environment[]; char * env_name_spec = "SPI Flash"; -env_t *env_ptr; static struct spi_flash *env_flash; @@ -79,7 +78,7 @@ int saveenv(void) char *saved_buffer = NULL; u32 sector = 1; int ret; - char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG; + char flag = OBSOLETE_FLAG; if (!env_flash) { env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, @@ -159,7 +158,7 @@ int saveenv(void) gd->env_valid = (gd->env_valid == 2 ? 1 : 2); - printf("Valid environment: %d\n", gd->env_valid); + printf("Valid environment: %d\n", (int)gd->env_valid); done: if (saved_buffer) @@ -174,25 +173,20 @@ void env_relocate_spec(void) env_t *tmp_env1 = NULL; env_t *tmp_env2 = NULL; env_t *ep = NULL; - uchar flag1, flag2; - /* current_env is set only in case both areas are valid! */ - int current_env = 0; tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE); tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE); if (!tmp_env1 || !tmp_env2) { - free(tmp_env1); - free(tmp_env2); set_default_env("!malloc() failed"); - return; + goto out; } env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); if (!env_flash) { set_default_env("!spi_flash_probe() failed"); - return; + goto out; } ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET, @@ -204,33 +198,30 @@ void env_relocate_spec(void) if (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc) crc1_ok = 1; - flag1 = tmp_env1->flags; ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, tmp_env2); if (!ret) { if (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc) crc2_ok = 1; - flag2 = tmp_env2->flags; } if (!crc1_ok && !crc2_ok) { - free(tmp_env1); - free(tmp_env2); set_default_env("!bad CRC"); - return; + goto err_read; } else if (crc1_ok && !crc2_ok) { gd->env_valid = 1; - ep = tmp_env1; } else if (!crc1_ok && crc2_ok) { + gd->env_valid = 2; + } else if (tmp_env1->flags == ACTIVE_FLAG && + tmp_env2->flags == OBSOLETE_FLAG) { gd->env_valid = 1; - } else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) { - gd->env_valid = 1; - } else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) { + } else if (tmp_env1->flags == OBSOLETE_FLAG && + tmp_env2->flags == ACTIVE_FLAG) { gd->env_valid = 2; - } else if (flag1 == flag2) { + } else if (tmp_env1->flags == tmp_env2->flags) { gd->env_valid = 2; - } else if (flag1 == 0xFF) { + } else if (tmp_env1->flags == 0xFF) { gd->env_valid = 2; } else { /* @@ -240,8 +231,6 @@ void env_relocate_spec(void) gd->env_valid = 2; } - free(env_ptr); - if (gd->env_valid == 1) ep = tmp_env1; else @@ -257,10 +246,6 @@ err_read: spi_flash_free(env_flash); env_flash = NULL; out: - if (tmp_env1) - free(tmp_env1); - if (tmp_env2) - free(tmp_env2); free(tmp_env1); free(tmp_env2);

2 1

[U-Boot] mpq101 board broken
by Wolfgang Denk 28 Apr '11

28 Apr '11

Dear Alex, the mpq101 board support is broken in recent versions of U-Boot: Configuring for mpq101 board... ppc_85xxDP-ld: u-boot: section .ppcenv lma 0xfffc0000 overlaps previous sections Can you please have a look? 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 I must follow the people. Am I not their leader? - Benjamin Disraeli

3 7

[U-Boot] [PATCH 1/2] MX31: mx31pdk: Add watchdog support
by Fabio Estevam 27 Apr '11

27 Apr '11

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx31pdk/mx31pdk.c | 16 ++++++++++++++++ include/configs/mx31pdk.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c index a9f0fb4..4a5d3ef 100644 --- a/board/freescale/mx31pdk/mx31pdk.c +++ b/board/freescale/mx31pdk/mx31pdk.c @@ -28,9 +28,17 @@ #include <netdev.h> #include <asm/arch/mx31.h> #include <asm/arch/mx31-regs.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_HW_WATCHDOG +void hw_watchdog_reset(void) +{ + mxc_hw_watchdog_reset(); +} +#endif + int dram_init(void) { /* dram_init must store complete ramsize in gd->ram_size */ @@ -68,6 +76,14 @@ int board_init(void) return 0; } +int board_late_init(void) +{ +#ifdef CONFIG_HW_WATCHDOG + mxc_hw_watchdog_enable(); +#endif + return 0; +} + int checkboard(void) { printf("Board: i.MX31 MAX PDK (3DS)\n"); diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 86c758f..1f1de46 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -61,6 +61,7 @@ #define CONFIG_MXC_UART 1 #define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_HW_WATCHDOG #define CONFIG_HARD_SPI 1 #define CONFIG_MXC_SPI 1 -- 1.6.0.4

4 6

[U-Boot] [PATCH v6 0/7] those series patches for add ben nanonote board
by Xiangfu Liu 26 Apr '11

26 Apr '11

Hi Wolfgang those patches are for add xburst jz4740 base file and Ben NanoNote (codename qi_lb60) to U-Boot some info about xburst jz4740: the xburst jz4740 is recently added to linux 2.6.36 and it's support the device Ben NanoNote out of box, this xburst jz4740 cpu have one feature is Boot From USB, there is a small rom in jz4740, but LOW some PIN, the cpu will boot to this small rom, then init cpu and USB module, then we can send 8KB bin file to the cpu by USB(by using 'xbboot' or 'usbboot'[1]). which means if your bootloader is borken,(the first few KBs in NAND) you can always boot the device from usb, then reflash the nand. in OpenMoko FreeRunner, there are NOR and NAND. when people broken the nand bootloader, it's must boot from NOR, reflash the bootloader back when people broken the NAND and NOR, he(she) must reflash by using JTAG but in Ben NanoNote, we just need boot from usb. flash the nand again :) BTW:there are a lot of PMP, Audio device in China use the Xburst cpu, but I think they are all base on u-boot 1.1.6. by working on Ben NanoNote (http://en.qi-hardware.com) one year, we try to update the u-boot to last version and send it to upstream. :) for more info about Ingenic Xburst JZ4740 http://www.ingenic.cn/eng/default.aspx http://www.linux-mips.org/wiki/Ingenic Xiangfu Liu (7): those files are jz4740 base files this is jz4740 head file jz4740 nand spl files jz4740 nand driver add Ben NanoNote board add entry to MAINTAINERS and boards.cfg modify files for ben nanonote board MAINTAINERS | 4 + MAKEALL | 4 +- Makefile | 13 + arch/mips/cpu/xburst/Makefile | 50 ++ arch/mips/cpu/xburst/config.mk | 33 + arch/mips/cpu/xburst/cpu.c | 160 +++++ arch/mips/cpu/xburst/jz4740.c | 264 +++++++ arch/mips/cpu/xburst/jz_serial.c | 114 +++ arch/mips/cpu/xburst/start.S | 160 +++++ arch/mips/cpu/xburst/start_spl.S | 63 ++ arch/mips/cpu/xburst/timer.c | 167 +++++ arch/mips/cpu/xburst/usbboot.S | 841 ++++++++++++++++++++++ arch/mips/include/asm/global_data.h | 15 + arch/mips/include/asm/jz4740.h | 1102 +++++++++++++++++++++++++++++ arch/mips/lib/board.c | 8 + arch/mips/lib/time.c | 2 + board/xburst/nanonote/Makefile | 45 ++ board/xburst/nanonote/config.mk | 31 + board/xburst/nanonote/nanonote.c | 95 +++ board/xburst/nanonote/u-boot-nand.lds | 63 ++ boards.cfg | 1 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/jz4740_nand.c | 329 +++++++++ include/configs/nanonote.h | 205 ++++++ include/configs/qi_lb60.h | 34 + nand_spl/board/xburst/nanonote/Makefile | 106 +++ nand_spl/board/xburst/nanonote/u-boot.lds | 63 ++ 27 files changed, 3972 insertions(+), 1 deletions(-) create mode 100644 arch/mips/cpu/xburst/Makefile create mode 100644 arch/mips/cpu/xburst/config.mk create mode 100644 arch/mips/cpu/xburst/cpu.c create mode 100644 arch/mips/cpu/xburst/jz4740.c create mode 100644 arch/mips/cpu/xburst/jz_serial.c create mode 100644 arch/mips/cpu/xburst/start.S create mode 100644 arch/mips/cpu/xburst/start_spl.S create mode 100644 arch/mips/cpu/xburst/timer.c create mode 100644 arch/mips/cpu/xburst/usbboot.S create mode 100644 arch/mips/include/asm/jz4740.h create mode 100644 board/xburst/nanonote/Makefile create mode 100644 board/xburst/nanonote/config.mk create mode 100644 board/xburst/nanonote/nanonote.c create mode 100644 board/xburst/nanonote/u-boot-nand.lds create mode 100644 drivers/mtd/nand/jz4740_nand.c create mode 100644 include/configs/nanonote.h create mode 100644 include/configs/qi_lb60.h create mode 100644 nand_spl/board/xburst/nanonote/Makefile create mode 100644 nand_spl/board/xburst/nanonote/u-boot.lds

3 22

[U-Boot] Trying again: DNS323
by Rogan Dawes 26 Apr '11

26 Apr '11

Hi folks, After a bit of a hiatus, I am trying again to get my DNS323 config working properly. This is a Marvell Orion5x based device, very similar to the EDMiniv2. Unfortunately, I am having some difficulty in forward porting it to the new relocation scheme. I have it working based on a point after 2010.06, prior to the introduction of all the relocation rework. My configuration was based on that of the edminiv2, and I basically reapplied my changes to current mainline, comparing them to the current edminiv2 configuration. Unfortunately, it simply doesn't boot. Note that I have not yet tried to flash the image to the device, it is configured for chain loading from the current vendor U-Boot, using the CONFIG_SKIP_LOWLEVEL_INIT option. I would have thought that this would have eliminated the relocation code completely, since relocation should only happen when booting directly from flash, I would think? Has anyone tested to verify whether CONFIG_SKIP_LOWLEVEL_INIT still works? As an aside, it seems that there are differences in gcc 4.3 and gcc 4.5 that prevent images compiled with 4.5 from working. Compiling my working config with 4.3 results in a working image, compiling with 4.5 results in a non-working image. If anyone wants to work out what the differences are, and how to get 4.5 to build successfully, please let me know. Regards, Rogan

6 49

[U-Boot] [PATCH 0/2] rtc, rv3029: add support for trickle charger
by Heiko Schocher 26 Apr '11

26 Apr '11

This patchseries adds trickle charger support for the RTC RV3029 and add it to the existing digsy_mtc board (rev5 boards only). checkpatch says: total: 0 errors, 0 warnings, 117 lines checked 20110328/0001-rtc-rv3029-add-trickle-charger-support.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 7 lines checked 20110328/0002-mpc52xx-digsy_mtc-add-trickle-charger-support-for-re.patch has no obvious style problems and is ready for submission. Heiko Schocher (2): rtc, rv3029: add trickle charger support. mpc52xx, digsy_mtc: add trickle charger support for rev5 boards. README | 2 + drivers/rtc/rv3029.c | 87 +++++++++++++++++++++++++++++++++++++++++++ include/configs/digsy_mtc.h | 1 + 3 files changed, 90 insertions(+), 0 deletions(-) -- 1.7.4

3 8

[U-Boot] [PATCH] Fix typo in #error: IS_IN_NOWHERE vs. IS_NOWHERE
by Loïc Minier 26 Apr '11

26 Apr '11

Signed-off-by: Loïc Minier <loic.minier(a)linaro.org> --- common/cmd_nvedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index fb69c24..c9ee3ed 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -65,7 +65,7 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|MG_DISK|NVRAM|MMC|NOWHERE} +SPI_FLASH|MG_DISK|NVRAM|MMC} or CONFIG_ENV_IS_NOWHERE #endif #define XMK_STR(x) #x -- 1.7.4.1

2 1

[U-Boot] OMAP3 Regression after merging ARM relocation code for custom board
by Luca Ceresoli 25 Apr '11

25 Apr '11

Wolfgang, Albert, all, following last week's discussion [1], here's the patch that would implement Comelit CPS board support in U-boot. The point is that this code is not booting. It is a rebase on top of current master of a previous, working, version based on v2010.06. During the rebase process, the code stopped working after rebasing on top of the ARM Relocation commits. FWIW, The code compiles correctly. As you can see by looking at the patch, the core is implemented just like the BeagleBoard's code. This is because the two boards are identical in terms of the core devices required for booting (same CPU, same NAND, same model of RAM but only one chip installed). A detailed problem report is in the mentioned thread [1]. I hope this helps in finding the issue and finally merge in U-boot. Thanks in advance, Luca [1] http://lists.denx.de/pipermail/u-boot/2011-March/088704.html

5 48

[U-Boot] [PATCH 1/2] cmd_ide: enhance new feature "CONFIG_IDE_AHB"
by Macpaul Lin 25 Apr '11

25 Apr '11

Although most IDE controller is designed to be connected to PCI bridge, there are still some IDE controller support AHB interface for SoC design. The driver implementation of these IDE-AHB controllers differ from other IDE-PCI controller, some additional registers and commands access is required during CMD/DATA I/O. Hence a configuration "CONFIG_IDE_AHB" in cmd_ide.c is required to be defined to support these kinds of SoC controllers. Such as Faraday's FTIDE020 series and Global Unichip's UINF-0301. Signed-off-by: Macpaul Lin <macpaul(a)andestech.com> --- README | 8 ++++++++ common/cmd_ide.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/README b/README index 727bf8a..3de0605 100644 --- a/README +++ b/README @@ -2673,6 +2673,14 @@ Low Level (hardware related) configuration options: source code. It is used to make hardware dependant initializations. +- CONFIG_IDE_AHB: + Most IDE controllers were designed to be connected with PCI + interface. Only few of them were designed for AHB interface. + When software is doing ATA command and data transfer to + IDE devices through IDE-AHB controller, some additional + registers accessing to these kind of IDE-AHB controller + is requierd. + - CONFIG_SYS_IMMR: Physical address of the Internal Memory. DO NOT CHANGE unless you know exactly what you're doing! (11-4) [MPC8xx/82xx systems only] diff --git a/common/cmd_ide.c b/common/cmd_ide.c index ea0f4a7..edb4fc0 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -518,8 +518,22 @@ __ide_outb(int dev, int port, unsigned char val) { debug ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n", dev, port, val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); + +#if defined(CONFIG_IDE_AHB) + if (port) { + /* write command */ + extern void ide_write_register(int, unsigned int, unsigned char); + + ide_write_register(dev, port, val); + } else { + /* write data */ + outb(val, (ATA_CURR_BASE(dev))); + } +#else outb(val, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); +#endif } + void ide_outb (int dev, int port, unsigned char val) __attribute__((weak, alias("__ide_outb"))); @@ -527,7 +541,15 @@ unsigned char inline __ide_inb(int dev, int port) { uchar val; + +#if defined(CONFIG_IDE_AHB) + extern unsigned char ide_read_register(int, unsigned int); + + val = ide_read_register(dev, port); +#else val = inb((ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port))); +#endif + debug ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n", dev, port, (ATA_CURR_BASE(dev)+CONFIG_SYS_ATA_PORT_ADDR(port)), val); return val; @@ -696,6 +718,7 @@ void ide_init (void) ide_dev_desc[i].blksz=0; ide_dev_desc[i].lba=0; ide_dev_desc[i].block_read=ide_read; + ide_dev_desc[i].block_write = ide_write; if (!ide_bus_ok[IDE_BUS(i)]) continue; ide_led (led, 1); /* LED on */ @@ -902,7 +925,13 @@ output_data(int dev, ulong *sect_buf, int words) static void output_data(int dev, ulong *sect_buf, int words) { - outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words<<1); +#if defined(CONFIG_IDE_AHB) + extern void ide_write_data(int, ulong *, int); + + ide_write_data(dev, sect_buf, words); +#else + outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words << 1); +#endif } #endif /* CONFIG_IDE_SWAP_IO */ @@ -960,7 +989,13 @@ input_data(int dev, ulong *sect_buf, int words) static void input_data(int dev, ulong *sect_buf, int words) { +#if defined(CONFIG_IDE_AHB) + extern void ide_read_data(int, ulong *, int); + + ide_read_data(dev, sect_buf, words); +#else insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words << 1); +#endif } #endif /* CONFIG_IDE_SWAP_IO */ -- 1.7.3.5

3 4