August 2005 - U-Boot

[U-Boot-Users] [PATCH] make bootretry work with the hush shell
by Andreas Engel 12 Aug '05

12 Aug '05

CHANGELOG entry: * Patch by Andreas Engel, 19 July 2005 make the bootretry feature work with the hush shell. Caveat: this currently *requires* CONFIG_RESET_TO_RETRY to be set too Regards, Andreas Engel

2 1

[U-Boot-Users] [PATCH] update to "tools/bddb"
by Murray.Jensen＠csiro.au 12 Aug '05

12 Aug '05

This patch contains an update to the php code in "tools/bddb". I doubt anyone is actually using this code, but its a good reference, and besides if it isn't going to be kept up-to-date, it should be removed. Cheers! Murray... CHANGELOG entry: * Patch by Murray Jensen, July 1, 2005: - update for Hymod Board Database PHP code in "tools" directory Copyright: This patch 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. -- Murray Jensen, CSIRO Manufacturing & Infra. Tech. Phone: +61 3 9662 7763 Locked Bag No. 9, Preston, Vic, 3072, Australia. Fax: +61 3 9662 7853 Internet: Murray.Jensen(a)csiro.au To the extent permitted by law, CSIRO does not represent, warrant and/or guarantee that the integrity of this communication has been maintained or that the communication is free of errors, virus, interception or interference. The information contained in this e-mail may be confidential or privileged. Any unauthorised use or disclosure is prohibited. If you have received this e-mail in error, please delete it immediately and notify Murray Jensen on +61 3 9662 7763. Thank you.

2 1

[U-Boot-Users] [PATCH] make use of "tr" posix compliant, and export HOSTOS var
by Murray.Jensen＠csiro.au 12 Aug '05

12 Aug '05

This patch makes the use of the "tr" command posix compliant when setting the HOSTOS make variable, and also exports this variable for use in sub-makes (I needed to access to HOSTOS in my board "config.mk" fragment). Cheers! Murray... -- Murray Jensen, CSIRO Manufacturing & Infra. Tech. Phone: +61 3 9662 7763 Locked Bag No. 9, Preston, Vic, 3072, Australia. Fax: +61 3 9662 7853 Internet: Murray.Jensen(a)csiro.au To the extent permitted by law, CSIRO does not represent, warrant and/or guarantee that the integrity of this communication has been maintained or that the communication is free of errors, virus, interception or interference. The information contained in this e-mail may be confidential or privileged. Any unauthorised use or disclosure is prohibited. If you have received this e-mail in error, please delete it immediately and notify Murray Jensen on +61 3 9662 7763. Thank you.

2 1

[U-Boot-Users] [PATCH] change my email address
by Murray.Jensen＠csiro.au 12 Aug '05

12 Aug '05

This patch changes my email address in all files where it appears. Cheers! Murray... -- Murray Jensen, CSIRO Manufacturing & Infra. Tech. Phone: +61 3 9662 7763 Locked Bag No. 9, Preston, Vic, 3072, Australia. Fax: +61 3 9662 7853 Internet: Murray.Jensen(a)csiro.au To the extent permitted by law, CSIRO does not represent, warrant and/or guarantee that the integrity of this communication has been maintained or that the communication is free of errors, virus, interception or interference. The information contained in this e-mail may be confidential or privileged. Any unauthorised use or disclosure is prohibited. If you have received this e-mail in error, please delete it immediately and notify Murray Jensen on +61 3 9662 7763. Thank you.

2 1

[U-Boot-Users] Patch PHY Reset (needed for Marvell 88E1111)
by Carl Riechers 12 Aug '05

12 Aug '05

Attached is a patch that preserved the contents of PHY_BMCR during a soft reset by only setting the reset bit. This allows the PHY strapping to be preserved. The patch also include an enhancement that allows overiding of the miiphy_speed and miiphy_duplex functions when RGMII is used without PHYs for proper MAC configuration. Regards, Carl Riechers ____________________________________________________ Yahoo! Sports Rekindle the Rivalries. Sign up for Fantasy Football http://football.fantasysports.yahoo.com --- u-boot/common/miiphyutil.c 2005-06-24 14:02:18.457551500 -0500 +++ u-boot/common/miiphyutil.c 2005-06-24 14:03:17.000000000 -0500 @@ -29,6 +29,14 @@ #include <common.h> #include <miiphy.h> +/* undefine functions that may have been renamed for a specific board */ +#ifdef miiphy_speed +#undef miiphy_speed +#endif +#ifdef miiphy_duplex +#undef miiphy_duplex +#endif + #if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) /***************************************************************************** @@ -93,7 +101,13 @@ int miiphy_reset (unsigned char addr) unsigned short reg; int loop_cnt; - if (miiphy_write (addr, PHY_BMCR, 0x8000) != 0) { + if (miiphy_read (addr, PHY_BMCR, &reg) != 0) { +#ifdef DEBUG + printf ("PHY status read failed\n"); +#endif + return (-1); + } + if (miiphy_write (addr, PHY_BMCR, reg | 0x8000) != 0) { #ifdef DEBUG puts ("PHY reset failed\n"); #endif

2 1

[U-Boot-Users] Patches for ARM IntegratorCP, ARM926EJS, and ARM946ES
by Shawn Jin 12 Aug '05

12 Aug '05

Hi, The patches were developed on an ARM IntegratorCP board with ARM946ES. Since the majority code of ARM946ES cpu was copied from ARM926EJS and there was bug about CFG_HZ found in ARM946ES later, I also fixed this CFG_HZ error on ARM926EJS. The major changes are 1. Mulitple core modules support (u-boot.multicm.patch) Following OMAP boards' methodology, I added mulitple core module configuration. For example, integratorcp_946es_config is for IntegratorCP board with ARM946ES, integratorcp_config is for IntegratorCP board with ARM926EJS by default, integratorap_946es_config is for IntegratorAP board with ARM946ES, and integratorap_config is for IntegratorAP with ARM926EJS. Now only two core modules are supported, ARM946ES and ARM926EJS. 2. ARM946ES support (u-boot.arm946es.patch) 3. ARM926EJS bug fix (u-boot.arm926ejs.patch) Fixed CFG_HZ problem. Set CFG_HZ to 1000. The solution is from AT91RM9200. 4. IntegratorCP bug fixes (u-boot.integratorcp.patch) Added SDRAM size information and FLASH support. Philippe, I don't have an ARM926EJS core module. Would you please test the CFG_HZ fix on your system? Thanks. Regards, -Shawn.

3 6

[U-Boot-Users] [PATCH] VoiceBlue update
by Ladislav Michl 12 Aug '05

12 Aug '05

Hi Wolfgang, please consider applying this board specific patch. You may find some updated trivial patches I sent to mailing list here: ftp://ftp.linux-mips.org/pub/linux/mips/people/ladis/u-boot/ CHANGELOG * Patch by Ladislav Michl, 23 May 2005: VoiceBlue update: eeprom tool can also store firmware version now. eeprom.bin is runable by jumping at load address. Index: board/voiceblue/Makefile =================================================================== RCS file: /cvsroot/u-boot/u-boot/board/voiceblue/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- board/voiceblue/Makefile 5 Apr 2005 23:32:24 -0000 1.1 +++ board/voiceblue/Makefile 23 May 2005 07:52:32 -0000 @@ -32,21 +32,23 @@ gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) LOAD_ADDR = 0x10400000 +LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds all: $(LIB) eeprom.srec eeprom.bin $(LIB): $(OBJS) $(SOBJS) $(AR) crv $@ $(OBJS) $(SOBJS) -eeprom.srec: eeprom.o - $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e $(<:.o=) $^ \ +eeprom.srec: eeprom.o eeprom_start.o + $(LD) -T $(LDSCRIPT) -g -Ttext $(LOAD_ADDR) \ + -o $(<:.o=) -e $(<:.o=) $^ \ -L../../examples -lstubs \ -L../../lib_generic -lgeneric \ -L$(gcclibdir) -lgcc $(OBJCOPY) -O srec $(<:.o=) $@ eeprom.bin: eeprom.srec - $(OBJCOPY) -O binary $< $@ 2>/dev/null + $(OBJCOPY) -I srec -O binary $< $@ 2>/dev/null clean: rm -f $(SOBJS) $(OBJS) eeprom eeprom.srec eeprom.bin Index: board/voiceblue/eeprom.c =================================================================== RCS file: /cvsroot/u-boot/u-boot/board/voiceblue/eeprom.c,v retrieving revision 1.1 diff -u -r1.1 eeprom.c --- board/voiceblue/eeprom.c 5 Apr 2005 23:32:24 -0000 1.1 +++ board/voiceblue/eeprom.c 23 May 2005 07:52:32 -0000 @@ -30,40 +30,6 @@ #define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE -static int verify_macaddr(char *); -static int set_mac(char *); - -int eeprom(int argc, char *argv[]) -{ - app_startup(argv); - if (get_version() != XF_VERSION) { - printf("Wrong XF_VERSION.\n"); - printf("Application expects ABI version %d\n", XF_VERSION); - printf("Actual U-Boot ABI version %d\n", (int)get_version()); - return 1; - } - - if ((SMC_inw (BANK_SELECT) & 0xFF00) != 0x3300) { - printf("SMSC91111 not found.\n"); - return 2; - } - - if (argc != 2) { - printf("VoiceBlue EEPROM writer\n"); - printf("Built: %s at %s\n", __DATE__ , __TIME__ ); - printf("Usage:\n\t<mac_address>"); - return 3; - } - - set_mac(argv[1]); - if (verify_macaddr(argv[1])) { - printf("*** ERROR ***\n"); - return 4; - } - - return 0; -} - static u16 read_eeprom_reg(u16 reg) { int timeout; @@ -106,17 +72,28 @@ return 1; } +static int write_data(u16 *buf, int len) +{ + u16 reg = 0x23; + + while (len--) + write_eeprom_reg(*buf++, reg++); + + return 0; +} + static int verify_macaddr(char *s) { u16 reg; int i, err = 0; - printf("Verifying MAC Address: "); + printf("MAC Address: "); err = i = 0; for (i = 0; i < 3; i++) { reg = read_eeprom_reg(0x20 + i); printf("%02x:%02x%c", reg & 0xff, reg >> 8, i != 2 ? ':' : '\n'); - err |= reg != ((u16 *)s)[i]; + if (s) + err |= reg != ((u16 *)s)[i]; } return err ? 0 : 1; @@ -138,3 +115,98 @@ return 0; } + +static int parse_element(char *s, unsigned char *buf, int len) +{ + int cnt; + char *p, num[3]; + unsigned char id; + + id = simple_strtoul(s, &p, 16); + if (*p++ != ':') + return -1; + cnt = 2; + num[2] = 0; + for (; *p; p += 2) { + if (p[1] == 0) + return -2; + if (cnt + 3 > len) + return -3; + num[0] = p[0]; + num[1] = p[1]; + buf[cnt++] = simple_strtoul(num, NULL, 16); + } + buf[0] = id; + buf[1] = cnt - 2; + + return cnt; +} + +int eeprom(int argc, char *argv[]) +{ + int i, len, ret; + unsigned char buf[58], *p; + + app_startup(argv); + if (get_version() != XF_VERSION) { + printf("Wrong XF_VERSION.\n"); + printf("Application expects ABI version %d\n", XF_VERSION); + printf("Actual U-Boot ABI version %d\n", (int)get_version()); + return 1; + } + + if ((SMC_inw (BANK_SELECT) & 0xFF00) != 0x3300) { + printf("SMSC91111 not found.\n"); + return 2; + } + + /* Called without parameters - print MAC address */ + if (argc < 2) { + verify_macaddr(NULL); + return 0; + } + + /* Print help message */ + if (argv[1][1] == 'h') { + printf("VoiceBlue EEPROM writer\n"); + printf("Built: %s at %s\n", __DATE__ , __TIME__ ); + printf("Usage:\n\t<mac_address> [<element_1>] [<...>]\n"); + return 0; + } + + /* Try to parse information elements */ + len = sizeof(buf); + p = buf; + for (i = 2; i < argc; i++) { + ret = parse_element(argv[i], p, len); + switch (ret) { + case -1: + printf("Element %d: malformed\n", i - 1); + return 3; + case -2: + printf("Element %d: odd character count\n", i - 1); + return 3; + case -3: + printf("Out of EEPROM memory\n"); + return 3; + default: + p += ret; + len -= ret; + } + } + + /* First argument (MAC) is mandatory */ + set_mac(argv[1]); + if (verify_macaddr(argv[1])) { + printf("*** MAC address does not match! ***\n"); + return 4; + } + + while (len--) + *p++ = 0; + + write_data((u16 *)buf, sizeof(buf) >> 1); + + return 0; +} + --- /dev/null 2005-05-23 10:45:10.477452184 +0200 +++ board/voiceblue/eeprom.lds 2005-05-17 09:29:35.000000000 +0200 @@ -0,0 +1,51 @@ +/* + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, <gj(a)denx.de> + * (C) Copyright 2005 + * Ladislav Michl, 2N Telekomunikace, <michl(a)2n.cz> + * + * 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 + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = ALIGN(4); + .text : + { + eeprom_start.o (.text) + *(.text) + } + + . = ALIGN(4); + .rodata : { *(.rodata) } + + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + . = ALIGN(4); + __bss_start = .; + .bss : { *(.bss) } + _end = .; +} --- /dev/null 2005-05-23 10:45:10.477452184 +0200 +++ board/voiceblue/eeprom_start.S 2005-05-17 09:34:11.000000000 +0200 @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2005 2N Telekomunikace + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + */ + +.globl _start +_start: b eeprom +

2 1

[U-Boot-Users] Minor cleanup
by Anders Larsen 12 Aug '05

12 Aug '05

Hi, Rick Bronson and the AT91RM9200DK is listed under PPC Systems. Since the AT91RM9200 is an ARM SoC, the attached patch against current top of CVS moves the entry to the appropriate position. Changelog: Move the AT91RM9200DK to the ARM Systems list. Cheers Anders

2 1

[U-Boot-Users] Eliminate calls of _divsi3 on ARM
by Anders Larsen 12 Aug '05

12 Aug '05

Hi, the enclosed patch agains current top of CVS eliminates two calls of the libgcc helper function _divsi3 and _modsi3. Rationale: Certain commercially available tool-chains provides b0rken libgcc.a (compiled with hardware FP) making these helper functions unusable (U-Boot already provides the unsigned counterparts in lib_arm/libarm.a). Changelog: Eliminate calls of ARM libgcc.a helper functions _divsi3 and _modsi3 Cheers Anders

3 4

[U-Boot-Users] UBoot cvs compile error.
by Bryan O'Donoghue 12 Aug '05

12 Aug '05

make Adder_config edit config.mk uncomment -DDEBUG fails to resolve measure_gclk Changing cpu/mpc8xx/speed.c #if !defined(CONFIG_8xx_CPUCLK_DEFAULT) || defined(CFG_MEASURE_CPUCLK) to #if !defined(CONFIG_8xx_CPUCLK_DEFAULT) || defined(CFG_MEASURE_CPUCLK)\ || defined(DEBUG) fixes. -- Best regards Bryan

2 1