April 2011 - U-Boot

[U-Boot] [PATCH] Add 'led' command
by Jason Kridner 21 Apr '11

21 Apr '11

This patch allows any board implementing the coloured LED API to control the LEDs from the console. led [green | yellow | red | all ] [ on | off ] or led [ 1 | 2 | 3 | all ] [ on | off ] Adds configuration item CONFIG_CMD_LED enabling the command. Partially based on patch from Ulf Samuelsson: http://www.mail-archive.com/u-boot@lists.denx.de/msg09593.html. Updated based on feedback: http://www.mail-archive.com/u-boot@lists.denx.de/msg41847.html https://groups.google.com/d/topic/beagleboard/8Wf1HiK_QBo/discussion * Fixed a handful of style issues. * Significantly reduced the number of #ifdefs and redundant code * Converted redundant code into loops test against a structure * Made use of cmd_usage() * Introduced a str_onoff() function, but haven't yet put it in common * Eliminated trailing newline Signed-off-by: Jason Kridner <jkridner(a)beagleboard.org> --- common/Makefile | 1 + common/cmd_led.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 0 deletions(-) create mode 100644 common/cmd_led.c diff --git a/common/Makefile b/common/Makefile index abea91c..762aba4 100644 --- a/common/Makefile +++ b/common/Makefile @@ -105,6 +105,7 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o +COBJS-$(CONFIG_CMD_LED) += cmd_led.o COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o COBJS-y += cmd_load.o COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o diff --git a/common/cmd_led.c b/common/cmd_led.c new file mode 100644 index 0000000..f1e8a62 --- /dev/null +++ b/common/cmd_led.c @@ -0,0 +1,153 @@ +/* + * (C) Copyright 2010 + * Jason Kridner <jkridner(a)beagleboard.org> + * + * Based on cmd_led.c patch from: + * http://www.mail-archive.com/u-boot@lists.denx.de/msg06873.html + * (C) Copyright 2008 + * Ulf Samuelsson <ulf.samuelsson(a)atmel.com> + * + * 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 + */ + +#include <common.h> +#include <config.h> +#include <command.h> +#include <status_led.h> + +struct led_tbl_s { + char *string; /* String for use in the command */ + led_id_t mask; /* Mask used for calling __led_set() */ + void (*on)(void); /* Optional fucntion for turning LED on */ + void (*off)(void); /* Optional fucntion for turning LED on */ +}; + +typedef struct led_tbl_s led_tbl_t; + +static const led_tbl_t led_commands[] = { +#ifdef CONFIG_BOARD_SPECIFIC_LED +#ifdef STATUS_LED_BIT + { "0", STATUS_LED_BIT, NULL, NULL }, +#endif +#ifdef STATUS_LED_BIT1 + { "1", STATUS_LED_BIT1, NULL, NULL }, +#endif +#ifdef STATUS_LED_BIT2 + { "2", STATUS_LED_BIT2, NULL, NULL }, +#endif +#ifdef STATUS_LED_BIT3 + { "3", STATUS_LED_BIT3, NULL, NULL }, +#endif +#endif +#ifdef STATUS_LED_GREEN + { "green", STATUS_LED_GREEN, green_LED_off, green_LED_on }, +#endif +#ifdef STATUS_LED_YELLOW + { "yellow", STATUS_LED_YELLOW, yellow_LED_off, yellow_LED_on }, +#endif +#ifdef STATUS_LED_RED + { "red", STATUS_LED_RED, red_LED_off, red_LED_on }, +#endif +#ifdef STATUS_LED_BLUE + { "blue", STATUS_LED_BLUE, blue_LED_off, blue_LED_on }, +#endif + { NULL, 0, NULL, NULL } +}; + +int str_onoff (char *var) +{ + if (strcmp(var, "off") == 0) { + return 0; + } + if (strcmp(var, "on") == 0) { + return 1; + } + return -1; +} + +int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int state, i; + + /* Validate arguments */ + if ((argc != 3)) { + return cmd_usage(cmdtp); + } + + state = str_onoff(argv[2]); + if (state < 0) { + return cmd_usage(cmdtp); + } + + for (i = 0; led_commands[i].string; i++) { + if ((strcmp("all", argv[1]) == 0) || + (strcmp(led_commands[i].string, argv[1]) == 0)) { + if (led_commands[i].on) { + if (state) { + led_commands[i].on(); + } else { + led_commands[i].off(); + } + } else { + __led_set(led_commands[i].mask, state); + } + break; + } + } + + /* If we ran out of matches, print Usage */ + if (!led_commands[i].string && !(strcmp("all", argv[1]) == 0)) { + return cmd_usage(cmdtp); + } + + return 0; +} + +U_BOOT_CMD( + led, 3, 1, do_led, + "led\t- [" +#ifdef CONFIG_BOARD_SPECIFIC_LED +#ifdef STATUS_LED_BIT + "0|" +#endif +#ifdef STATUS_LED_BIT1 + "1|" +#endif +#ifdef STATUS_LED_BIT2 + "2|" +#endif +#ifdef STATUS_LED_BIT3 + "3|" +#endif +#endif +#ifdef STATUS_LED_GREEN + "green|" +#endif +#ifdef STATUS_LED_YELLOW + "yellow|" +#endif +#ifdef STATUS_LED_RED + "red|" +#endif +#ifdef STATUS_LED_BLUE + "blue|" +#endif + "all] [on|off]\n", + "led [led_name] [on|off] sets or clears led(s)\n" +); -- 1.5.6.4

2 1

[U-Boot] Pull request: u-boot-fdt
by Gerald Van Baren 20 Apr '11

20 Apr '11

Dear Wolfgang, Sorry for the late pull request, due to other priorities (not the least being filling out tax forms :-/) I was unable to get this out sooner. I only have a one-liner bugfix by Kyle Moffett in the pull. Grant's changes "[PATCH 0/6] ARM device tree support improvements" look good in principle, but I had a compilation error using the PPC target we need to work that out. The following changes since commit d13ffa66aff1d9aed9081986492fb74c1a61a4a9: Kyle Moffett (1): fdt_support: Fix buffer overflow in fdt_fixup_memory_banks are available in the git repository at: git://git.denx.de/u-boot-fdt.git master Best regards, gvb

3 2

[U-Boot] Please pull u-boot-mmc.git phylib
by Andy Fleming 20 Apr '11

20 Apr '11

I've put all of the phylib patches in this tree. Please pull them from here. The following changes since commit 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba: Fabio Estevam (1): MAINTAINERS: fix email address case are available in the git repository at: git://www.denx.de/git/u-boot-mmc.git phylib Andy Fleming (7): Remove instances of phy_read/write miiphy: Fix some formatting issues Create PHY Lib for U-Boot phylib: Add a bunch of PHY drivers from tsec tsec: Convert tsec to use PHY Lib fsl: Change fsl_phy_enet_if to phy_interface_t Add mdio command for new PHY infrastructure Mingkai Hu (2): tsec: use IO accessors for IO accesses tsec: arrange the code to avoid useless function declaration arch/powerpc/cpu/mpc8xxx/fdt.c | 23 +- arch/powerpc/include/asm/config.h | 9 + arch/powerpc/include/asm/fsl_enet.h | 27 +- board/freescale/mpc8360emds/mpc8360emds.c | 10 +- board/freescale/mpc837xemds/mpc837xemds.c | 10 +- board/freescale/mpc8536ds/mpc8536ds.c | 6 + board/freescale/mpc8544ds/mpc8544ds.c | 30 + board/freescale/mpc8569mds/mpc8569mds.c | 4 +- board/freescale/mpc8572ds/mpc8572ds.c | 6 + board/freescale/p1022ds/p1022ds.c | 6 + board/freescale/p1_p2_rdb/p1_p2_rdb.c | 6 + board/freescale/p2020ds/p2020ds.c | 7 + common/Makefile | 4 + common/cmd_mdio.c | 286 +++++ common/miiphyutil.c | 311 +++-- drivers/net/Makefile | 2 +- drivers/net/dm9000x.c | 18 +- drivers/net/enc28j60.c | 24 +- drivers/net/fsl_mdio.c | 120 ++ drivers/net/phy/Makefile | 13 + drivers/net/phy/atheros.c | 48 + drivers/net/phy/broadcom.c | 288 +++++ drivers/net/phy/davicom.c | 98 ++ drivers/net/phy/generic_10g.c | 105 ++ drivers/net/phy/lxt.c | 87 ++ drivers/net/phy/marvell.c | 367 ++++++ drivers/net/phy/micrel.c | 40 + drivers/net/phy/natsemi.c | 96 ++ drivers/net/phy/phy.c | 753 +++++++++++ drivers/net/phy/realtek.c | 130 ++ drivers/net/phy/teranetics.c | 62 + drivers/net/phy/vitesse.c | 242 ++++ drivers/net/tsec.c | 1992 ++++------------------------- drivers/net/uli526x.c | 24 +- drivers/qe/uec.c | 59 +- drivers/qe/uec.h | 3 +- drivers/qe/uec_phy.c | 181 ++-- include/config_phylib_all_drivers.h | 32 + include/configs/MPC8323ERDB.h | 4 +- include/configs/MPC832XEMDS.h | 4 +- include/configs/MPC8360EMDS.h | 4 +- include/configs/MPC8360ERDK.h | 4 +- include/configs/MPC8568MDS.h | 4 +- include/configs/MPC8569MDS.h | 20 +- include/configs/kmeter1.h | 2 +- include/fsl_mdio.h | 62 + include/linux/ethtool.h | 721 +++++++++++ include/linux/mdio.h | 278 ++++ include/miiphy.h | 53 +- include/phy.h | 229 ++++ include/tsec.h | 302 +---- net/eth.c | 6 + 52 files changed, 4900 insertions(+), 2322 deletions(-) create mode 100644 common/cmd_mdio.c create mode 100644 drivers/net/fsl_mdio.c create mode 100644 drivers/net/phy/atheros.c create mode 100644 drivers/net/phy/broadcom.c create mode 100644 drivers/net/phy/davicom.c create mode 100644 drivers/net/phy/generic_10g.c create mode 100644 drivers/net/phy/lxt.c create mode 100644 drivers/net/phy/marvell.c create mode 100644 drivers/net/phy/micrel.c create mode 100644 drivers/net/phy/natsemi.c create mode 100644 drivers/net/phy/phy.c create mode 100644 drivers/net/phy/realtek.c create mode 100644 drivers/net/phy/teranetics.c create mode 100644 drivers/net/phy/vitesse.c create mode 100644 include/config_phylib_all_drivers.h create mode 100644 include/fsl_mdio.h create mode 100644 include/linux/ethtool.h create mode 100644 include/linux/mdio.h create mode 100644 include/phy.h

2 1

[U-Boot] Pull request u-boot-blackfin.git (misc branch)
by Mike Frysinger 20 Apr '11

20 Apr '11

Wolfgang: I put together this branch of my random little patches over the tree. These are the latest versions, and haven't garned any new feedback (if any at all). Just in case pulling a branch vs cherry picking random e-mails is easier. The following changes since commit b16aadf411280fc426d7488ddd8a5b2038b7194d: disk/part.c: fix potential stack overflow bug (2011-04-12 22:58:35 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git misc Mike Frysinger (7): env: make import/export optional make `go` optional crc32: make command optional md5sum/sha1sum/unzip: split out of mondo mem file gpio: generalize for all generic gpio providers config_defaults.h: drop OSE bootm default gpio: check request result README | 4 + arch/blackfin/cpu/Makefile | 1 - arch/blackfin/cpu/cmd_gpio.c | 118 -------------------------------------- arch/blackfin/include/asm/gpio.h | 53 +++++++++++++++++ common/Makefile | 4 + common/cmd_boot.c | 4 + common/cmd_gpio.c | 89 ++++++++++++++++++++++++++++ common/cmd_md5sum.c | 53 +++++++++++++++++ common/cmd_mem.c | 108 ++-------------------------------- common/cmd_nvedit.c | 8 +++ common/cmd_sha1sum.c | 53 +++++++++++++++++ common/cmd_unzip.c | 59 +++++++++++++++++++ include/config_cmd_defaults.h | 6 ++- include/config_defaults.h | 1 - 14 files changed, 338 insertions(+), 223 deletions(-) delete mode 100644 arch/blackfin/cpu/cmd_gpio.c create mode 100644 common/cmd_gpio.c create mode 100644 common/cmd_md5sum.c create mode 100644 common/cmd_sha1sum.c create mode 100644 common/cmd_unzip.c

2 1

[U-Boot] Pull request: nand flash
by Scott Wood 20 Apr '11

20 Apr '11

The following changes since commit 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba: MAINTAINERS: fix email address case (2011-04-13 22:40:51 +0200) are available in the git repository at: git://git.denx.de/u-boot-nand-flash.git master Alex Waterman (1): nand_spl: Fix large page nand_command() Dipen Dudhat (1): powerpc/85xx: Modify NAND loader makefiles to compile NAND_SPL linker script Florian Fainelli (2): NAND: Fix integer overflow in ONFI detection of chips >= 4GiB NAND: rearrange ONFI revision checking, add ONFI 2.3 Matthew McClintock (1): nand/spl: Assuming a static nand page size to reduce code size drivers/mtd/nand/nand_base.c | 22 +++++++++++++--------- nand_spl/board/freescale/mpc8536ds/Makefile | 11 +++++++---- nand_spl/board/freescale/mpc8569mds/Makefile | 11 +++++++---- nand_spl/board/freescale/mpc8572ds/Makefile | 11 +++++++---- nand_spl/board/freescale/p1_p2_rdb/Makefile | 11 +++++++---- nand_spl/nand_boot.c | 4 ++++ nand_spl/nand_boot_fsl_elbc.c | 10 +++++----- 7 files changed, 50 insertions(+), 30 deletions(-)

2 1

[U-Boot] [i2c] Pull request
by Heiko Schocher 20 Apr '11

20 Apr '11

Hello Wolfgang, please pull from: The following changes since commit 73e5476e1edf1b860dbd9b5fc21ef32ac1b551ba: MAINTAINERS: fix email address case (2011-04-13 22:40:51 +0200) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master Nick Thompson (1): I2C: OMAP: detect more devices when probing an i2c bus drivers/i2c/omap24xx_i2c.c | 42 +++++++++++------------------------------- 1 files changed, 11 insertions(+), 31 deletions(-) bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] Please pull u-boot-mmc.git
by Andy Fleming 20 Apr '11

20 Apr '11

I apologize for the long delay. Hopefully now that we're beginning to push out all of this p4080 stuff, I'll be able to stay on top of what's happening outside of Freescale. The following changes since commit b16aadf411280fc426d7488ddd8a5b2038b7194d: Lei Wen (1): disk/part.c: fix potential stack overflow bug are available in the git repository at: git://www.denx.de/git/u-boot-mmc.git master Alagu Sankar (1): SD1.00 wide-bus fix Frans Meulenbroeks (1): drivers/mmc/fsl_esdhc.c: reordered tests Matt Waddel (1): MMC: Max blocks value adjustable Mike Frysinger (1): mmc: constify & localize data Minkyu Kang (2): mmc: show mmc capacity using print_size mmc: remove duplicated header file Raffaele Recalcati (4): mmc: checking status after commands with R1b response mmc: SEND_OP_COND considers card capabilities (voltage) mmc: trace added MMC may wrongly regconize 2GB eMMC as high capacity Thomas Chou (1): mmc: add generic mmc spi driver Wolfgang Wegner (1): add CONFIG_SPI_IDLE_VAL for cf_spi.c to allow use of spi_mmc common/Makefile | 1 + common/cmd_mmc.c | 3 +- common/cmd_mmc_spi.c | 88 +++++++++++++++ drivers/mmc/Makefile | 1 + drivers/mmc/fsl_esdhc.c | 6 +- drivers/mmc/mmc.c | 260 ++++++++++++++++++++++++++++++++++++------- drivers/mmc/mmc_spi.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/spi/cf_spi.c | 14 ++- include/mmc.h | 11 ++ 9 files changed, 614 insertions(+), 50 deletions(-) create mode 100644 common/cmd_mmc_spi.c create mode 100644 drivers/mmc/mmc_spi.c

2 1

[U-Boot] DreamPlug bootloader replacement
by Jason 20 Apr '11

20 Apr '11

All, I'm attempting to replace u-boot on the new dreamplug. This is different from the guruplug and sheevaplug in that the bootloader is stored in a 1MB (!) flash connected via SPI. I was able to dump the factory u-boot to a file, and it's header looks strikingly similar to the u-boot.kwb image I used on my guruplug. However, the first 32 bits, supposedly the magic number, are different. Is that important? Here's the first 0x100 bytes starting at 0x0. ### factory dreamplug image ########################################### 0000000: 5a 00 00 00 54 49 02 00 00 00 00 00 00 02 00 00 0000010: 00 00 60 00 00 00 60 00 00 00 00 00 00 00 01 bc 0000020: 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0000040: e0 00 d1 ff 9b 9b 1b 1b 00 14 d0 ff 30 0c 00 43 0000050: 04 14 d0 ff 00 30 54 37 08 14 d0 ff 51 54 12 22 0000060: 0c 14 d0 ff 33 0a 00 00 10 14 d0 ff cc 00 00 00 0000070: 14 14 d0 ff 00 00 00 00 18 14 d0 ff 00 00 00 00 0000080: 1c 14 d0 ff 52 0c 00 00 20 14 d0 ff 40 00 00 00 0000090: 24 14 d0 ff 7f f1 00 00 28 14 d0 ff 20 55 08 00 00000a0: 7c 14 d0 ff 52 85 00 00 00 15 d0 ff 00 00 00 00 00000b0: 04 15 d0 ff f1 ff ff 0f 08 15 d0 ff 00 00 00 10 00000c0: 0c 15 d0 ff f5 ff ff 0f 14 15 d0 ff 00 00 00 00 00000d0: 1c 15 d0 ff 00 00 00 00 94 14 d0 ff 00 00 03 00 00000e0: 98 14 d0 ff 00 00 00 00 9c 14 d0 ff 03 e8 00 00 00000f0: 80 14 d0 ff 01 00 00 00 00 00 00 00 00 00 00 00 ### end factory dreamplug image ####################################### And, here's my u-boot.kwb: ### my u-boot.kwb ##################################################### 0000000: 8b 00 00 08 58 9d 03 00 00 00 00 00 00 02 00 00 0000010: 00 00 60 00 00 00 60 00 00 00 00 00 00 00 01 4e 0000020: 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0000040: e0 00 d1 ff 9b 9b 1b 1b 00 14 d0 ff 30 0c 00 43 0000050: 04 14 d0 ff 00 30 54 37 08 14 d0 ff 51 54 12 22 0000060: 0c 14 d0 ff 33 0a 00 00 10 14 d0 ff cc 00 00 00 0000070: 14 14 d0 ff 00 00 00 00 18 14 d0 ff 00 00 00 00 0000080: 1c 14 d0 ff 52 0c 00 00 20 14 d0 ff 40 00 00 00 0000090: 24 14 d0 ff 7f f1 00 00 28 14 d0 ff 20 55 08 00 00000a0: 7c 14 d0 ff 52 85 00 00 00 15 d0 ff 00 00 00 00 00000b0: 04 15 d0 ff f1 ff ff 0f 08 15 d0 ff 00 00 00 10 00000c0: 0c 15 d0 ff f5 ff ff 0f 14 15 d0 ff 00 00 00 00 00000d0: 1c 15 d0 ff 00 00 00 00 94 14 d0 ff 00 00 03 00 00000e0: 98 14 d0 ff 00 00 00 00 9c 14 d0 ff 03 e8 00 00 00000f0: 80 14 d0 ff 01 00 00 00 00 00 00 00 00 00 00 00 ### end my u-boot.kwb ################################################# Also, before I do a 'sf erase...; sf write...' I'd like to know I can recover via the jtag, if necessary. In theory, I should be able to load the factory image into RAM via jtag, and run it. Then, use tftpload and 'sf write' to restore the factory bootloader. What I'm missing is how to directly burn the spi flash from openocd. Has anyone done this? Is there a config I can reference? thx, Jason.

2 2

Re: [U-Boot] [PATCH] da850evm: fix NAND WSTROBE and TA timings
by Paulraj, Sandeep 20 Apr '11

20 Apr '11

> The current NAND timings, introduced in commit > a3f88293ddd13facd734769c1664d35ab4ed681f da850evm: setup the NAND flash > timings , incorrectly set WSTROBE and TA to 0. A more recent inspection of > the > values set by the Linux kernel indicates that these should be set to 1. > > Set the WSTROBE and TA field of the EMIFA cycle-count timings > configuration to > 1 to match the values set by linux. > > Signed-off-by: Ben Gardiner <bengardiner(a)nanometrics.ca> > CC: Stefano Babic <sbabic(a)denx.de> > CC: Sandeep Paulraj <s-paulraj(a)ti.com> > CC: Scott Wood <scottwood(a)freescale.com> > --- > board/davinci/da8xxevm/da850evm.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Thanks Pushed to u-boot-ti --Sandeep

1 0

[U-Boot] Fix for overlapping sections?
by Ciummo, Larry (DS-1) 20 Apr '11

20 Apr '11

Designation: Non-SSA/Finmeccanica A while back there was a fix for the overlapping section link problem (see below) involving changing some sort of global. Does anyone have a pointer to the change. I'm using a fairly old uboot for AMCC Canyonlands/460Ex and can't easily upgrade to a newer uboot build. Thanks Larry eldk/usr/bin/../lib/gcc/powerpc-linux/4.2.2/pic -lgcc -Map u-boot.map -o u-boot /opt/eldk/usr/bin/ppc_4xx-ld: section .bootpg [fffff000 -> fffff303] overlaps section .data.rel.local [ffffe1d8 -> fffffebb] /opt/eldk/usr/bin/ppc_4xx-ld: u-boot: section .bootpg lma 0xfffff000 overlaps previous sections /opt/eldk/usr/bin/ppc_4xx-ld: u-boot: section .u_boot_cmd lma 0xfffffebc overlaps previous sections make: *** [u-boot] Error 1 3.1.0805 3.1.0805

4 3