December 2007 - U-Boot

[U-Boot-Users] [PATCH 3/9] Add Ethernet 1000BASE-X support for PPC4xx
by Larry Johnson 27 Dec '07

27 Dec '07

This patch adds a new switch: "CONFIG_PHY_DYNAMIC_ANEG". When this symbol is defined, the PHY will advertise it's capabilities for autonegotiation based on the capabilities shown in the PHY's status registers, including 1000BASE-X. When "CONFIG_PHY_DYNAMIC_ANEG" is not defined, the PHY will advertise hard-coded capabilities, as before. Signed-off-by: Larry Johnson <lrj(a)acm.org> --- cpu/ppc4xx/miiphy.c | 143 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 100 insertions(+), 43 deletions(-) diff --git a/cpu/ppc4xx/miiphy.c b/cpu/ppc4xx/miiphy.c index 98ba0a7..97ec023 100644 --- a/cpu/ppc4xx/miiphy.c +++ b/cpu/ppc4xx/miiphy.c @@ -27,19 +27,6 @@ | | Author: Mark Wisner | - | Change Activity- - | - | Date Description of Change BY - | --------- --------------------- --- - | 05-May-99 Created MKW - | 01-Jul-99 Changed clock setting of sta_reg from 66Mhz to 50Mhz to - | better match OPB speed. Also modified delay times. JWB - | 29-Jul-99 Added Full duplex support MKW - | 24-Aug-99 Removed printf from dp83843_duplex() JWB - | 19-Jul-00 Ported to esd cpci405 sr - | 23-Dec-03 Ported from miiphy.c to 440GX Travis Sawyer TBS - | <travis.sawyer(a)sandburst.com> - | +-----------------------------------------------------------------------------*/ #include <common.h> @@ -61,7 +48,6 @@ void miiphy_dump (char *devname, unsigned char addr) unsigned long i; unsigned short data; - for (i = 0; i < 0x1A; i++) { if (miiphy_read (devname, addr, i, &data)) { printf ("read error for reg %lx\n", i); @@ -76,15 +62,87 @@ void miiphy_dump (char *devname, unsigned char addr) } /* end for loop */ } /* end dump */ - /***********************************************************/ /* (Re)start autonegotiation */ /***********************************************************/ int phy_setup_aneg (char *devname, unsigned char addr) { - unsigned short ctl, adv; + u16 bmcr; + +#if defined(CONFIG_PHY_DYNAMIC_ANEG) + /* + * Set up advertisement based on capablilities reported by the PHY. + * This should work for both copper and fiber. + */ + u16 bmsr; +#if defined(CONFIG_PHY_GIGE) + u16 exsr = 0x0000; +#endif + + miiphy_read (devname, addr, PHY_BMSR, &bmsr); + +#if defined(CONFIG_PHY_GIGE) + if (bmsr & PHY_BMSR_EXT_STAT) { + miiphy_read (devname, addr, PHY_EXSR, &exsr); + } + + if (exsr & (PHY_EXSR_1000XF | PHY_EXSR_1000XH)) { + /* 1000BASE-X */ + u16 anar = 0x0000; + + if (exsr & PHY_EXSR_1000XF) { + anar |= PHY_X_ANLPAR_FD; + } + if (exsr & PHY_EXSR_1000XH) { + anar |= PHY_X_ANLPAR_HD; + } + miiphy_write (devname, addr, PHY_ANAR, anar); + } else +#endif + { + u16 anar, btcr; + + miiphy_read (devname, addr, PHY_ANAR, &anar); + anar &= ~(0x5000 | PHY_ANLPAR_T4 | PHY_ANLPAR_TXFD | + PHY_ANLPAR_TX | PHY_ANLPAR_10FD | PHY_ANLPAR_10); + + miiphy_read (devname, addr, PHY_1000BTCR, &btcr); + btcr &= ~(0x00FF | PHY_1000BTCR_1000FD | PHY_1000BTCR_1000HD); + + if (bmsr & PHY_BMSR_100T4) { + anar |= PHY_ANLPAR_T4; + } + if (bmsr & PHY_BMSR_100TXF) { + anar |= PHY_ANLPAR_TXFD; + } + if (bmsr & PHY_BMSR_100TXH) { + anar |= PHY_ANLPAR_TX; + } + if (bmsr & PHY_BMSR_10TF) { + anar |= PHY_ANLPAR_10FD; + } + if (bmsr & PHY_BMSR_10TH) { + anar |= PHY_ANLPAR_10; + } + miiphy_write (devname, addr, PHY_ANAR, anar); + +#if defined(CONFIG_PHY_GIGE) + if (exsr & PHY_EXSR_1000TF) { + btcr |= PHY_1000BTCR_1000FD; + } + if (exsr & PHY_EXSR_1000TH) { + btcr |= PHY_1000BTCR_1000HD; + } + miiphy_write (devname, addr, PHY_1000BTCR, btcr); +#endif + } + +#else /* defined(CONFIG_PHY_DYNAMIC_ANEG) */ + /* + * Set up standard advertisement + */ + u16 adv; - /* Setup standard advertise */ miiphy_read (devname, addr, PHY_ANAR, &adv); adv |= (PHY_ANLPAR_ACK | PHY_ANLPAR_RF | PHY_ANLPAR_T4 | PHY_ANLPAR_TXFD | PHY_ANLPAR_TX | PHY_ANLPAR_10FD | @@ -95,15 +153,16 @@ int phy_setup_aneg (char *devname, unsigned char addr) adv |= (0x0300); miiphy_write (devname, addr, PHY_1000BTCR, adv); +#endif /* defined(CONFIG_PHY_DYNAMIC_ANEG) */ + /* Start/Restart aneg */ - miiphy_read (devname, addr, PHY_BMCR, &ctl); - ctl |= (PHY_BMCR_AUTON | PHY_BMCR_RST_NEG); - miiphy_write (devname, addr, PHY_BMCR, ctl); + miiphy_read (devname, addr, PHY_BMCR, &bmcr); + bmcr |= (PHY_BMCR_AUTON | PHY_BMCR_RST_NEG); + miiphy_write (devname, addr, PHY_BMCR, bmcr); return 0; } - /***********************************************************/ /* read a phy reg and return the value with a rc */ /***********************************************************/ @@ -156,21 +215,20 @@ unsigned int miiphy_getemac_offset (void) #endif } - -int emac4xx_miiphy_read (char *devname, unsigned char addr, - unsigned char reg, unsigned short *value) +int emac4xx_miiphy_read (char *devname, unsigned char addr, unsigned char reg, + unsigned short *value) { unsigned long sta_reg; /* STA scratch area */ unsigned long i; unsigned long emac_reg; - emac_reg = miiphy_getemac_offset (); /* see if it is ready for 1000 nsec */ i = 0; /* see if it is ready for sec */ - while ((in_be32((void *)EMAC_STACR + emac_reg) & EMAC_STACR_OC) == EMAC_STACR_OC_MASK) { + while ((in_be32((void *)EMAC_STACR + emac_reg) & EMAC_STACR_OC) == + EMAC_STACR_OC_MASK) { udelay (7); if (i > 5) { #ifdef ET_DEBUG @@ -187,10 +245,10 @@ int emac4xx_miiphy_read (char *devname, unsigned char addr, #if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_405EX) -#if defined(CONFIG_IBM_EMAC4_V4) /* EMAC4 V4 changed bit setting */ - sta_reg = (sta_reg & ~EMAC_STACR_OP_MASK) | EMAC_STACR_READ; +#if defined(CONFIG_IBM_EMAC4_V4) /* EMAC4 V4 changed bit setting */ + sta_reg = (sta_reg & ~EMAC_STACR_OP_MASK) | EMAC_STACR_READ; #else - sta_reg |= EMAC_STACR_READ; + sta_reg |= EMAC_STACR_READ; #endif #else sta_reg = (sta_reg | EMAC_STACR_READ) & ~EMAC_STACR_CLK_100MHZ; @@ -211,7 +269,7 @@ int emac4xx_miiphy_read (char *devname, unsigned char addr, sta_reg = in_be32((void *)EMAC_STACR + emac_reg); #ifdef ET_DEBUG - printf ("a21: read : EMAC_STACR=0x%0x\n", sta_reg); /* test-only */ + printf ("a21: read : EMAC_STACR=0x%0x\n", sta_reg); /* test-only */ #endif i = 0; while ((sta_reg & EMAC_STACR_OC) == EMAC_STACR_OC_MASK) { @@ -229,19 +287,17 @@ int emac4xx_miiphy_read (char *devname, unsigned char addr, return -1; } - *value = *(short *) (&sta_reg); + *value = *(short *)(&sta_reg); return 0; - } /* phy_read */ - /***********************************************************/ /* write a phy reg and return the value with a rc */ /***********************************************************/ -int emac4xx_miiphy_write (char *devname, unsigned char addr, - unsigned char reg, unsigned short value) +int emac4xx_miiphy_write (char *devname, unsigned char addr, unsigned char reg, + unsigned short value) { unsigned long sta_reg; /* STA scratch area */ unsigned long i; @@ -251,7 +307,8 @@ int emac4xx_miiphy_write (char *devname, unsigned char addr, /* see if it is ready for 1000 nsec */ i = 0; - while ((in_be32((void *)EMAC_STACR + emac_reg) & EMAC_STACR_OC) == EMAC_STACR_OC_MASK) { + while ((in_be32((void *)EMAC_STACR + emac_reg) & EMAC_STACR_OC) == + EMAC_STACR_OC_MASK) { if (i > 5) return -1; udelay (7); @@ -263,10 +320,10 @@ int emac4xx_miiphy_write (char *devname, unsigned char addr, #if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_405EX) -#if defined(CONFIG_IBM_EMAC4_V4) /* EMAC4 V4 changed bit setting */ - sta_reg = (sta_reg & ~EMAC_STACR_OP_MASK) | EMAC_STACR_WRITE; +#if defined(CONFIG_IBM_EMAC4_V4) /* EMAC4 V4 changed bit setting */ + sta_reg = (sta_reg & ~EMAC_STACR_OP_MASK) | EMAC_STACR_WRITE; #else - sta_reg |= EMAC_STACR_WRITE; + sta_reg |= EMAC_STACR_WRITE; #endif #else sta_reg = (sta_reg | EMAC_STACR_WRITE) & ~EMAC_STACR_CLK_100MHZ; @@ -278,8 +335,8 @@ int emac4xx_miiphy_write (char *devname, unsigned char addr, !defined(CONFIG_405EX) sta_reg = sta_reg | CONFIG_PHY_CLK_FREQ; /* Set clock frequency (PLB freq. dependend) */ #endif - sta_reg = sta_reg | ((unsigned long) addr << 5);/* Phy address */ - sta_reg = sta_reg | EMAC_STACR_OC_MASK; /* new IBM emac v4 */ + sta_reg = sta_reg | ((unsigned long)addr << 5); /* Phy address */ + sta_reg = sta_reg | EMAC_STACR_OC_MASK; /* new IBM emac v4 */ memcpy (&sta_reg, &value, 2); /* put in data */ out_be32((void *)EMAC_STACR + emac_reg, sta_reg); @@ -288,7 +345,7 @@ int emac4xx_miiphy_write (char *devname, unsigned char addr, i = 0; sta_reg = in_be32((void *)EMAC_STACR + emac_reg); #ifdef ET_DEBUG - printf ("a31: read : EMAC_STACR=0x%0x\n", sta_reg); /* test-only */ + printf ("a31: read : EMAC_STACR=0x%0x\n", sta_reg); /* test-only */ #endif while ((sta_reg & EMAC_STACR_OC) == EMAC_STACR_OC_MASK) { udelay (7); @@ -305,4 +362,4 @@ int emac4xx_miiphy_write (char *devname, unsigned char addr, return -1; return 0; -} /* phy_write */ +} /* phy_write */ -- 1.5.2.5

2 1

[U-Boot-Users] Can we drop I386 specific hack from do_bootm()?
by Bartlomiej Sieka 27 Dec '07

27 Dec '07

Hello, While working on adapting do_bootm() to new uImage format, I've came across this I386-specific hack: #ifdef __I386__ /* correct image format not implemented yet - fake it */ if (fake_header(hdr, (void*)addr, -1) != NULL) { /* to compensate for the addition below */ addr -= sizeof(image_header_t); /* turnof verify, * fake_header() does not fake the data crc */ verify = 0; } else #endif /* __I386__ */ It looks like I386 targets provide the kernel as an zImage, instead of an uImage, and this special case is needed to add a faked uImage header, so that the rest of the booting code works without modification. How about dropping this hack altogether? This would make the code cleaner, but would require I386 targets (sc520_cdp, sc520_spunk) to use kernels in uImage format. What do people think? What is the opinion of the maintainer of the affected platforms (Daniel Engström, copied)? Regards, Bartlomiej

1 1

[U-Boot-Users] [PATCH 2/9 RESUBMIT] Add driver for National Semiconductor LM73 temperature sensor
by Larry Johnson 27 Dec '07

27 Dec '07

This driver is based on the driver for the LM75. Signed-off-by: Larry Johnson <lrj(a)acm.org> --- Non-line-wrapped version. :-) drivers/hwmon/Makefile | 1 + drivers/hwmon/lm73.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dtt.h | 12 +++- 3 files changed, 193 insertions(+), 1 deletions(-) create mode 100644 drivers/hwmon/lm73.c diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index cebb2ba..32e3f44 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -34,6 +34,7 @@ COBJS-y += adm1021.o COBJS-y += ds1621.o COBJS-y += ds1722.o COBJS-y += ds1775.o +COBJS-y += lm73.o COBJS-y += lm75.o COBJS-y += lm81.o diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c new file mode 100644 index 0000000..f9ae012 --- /dev/null +++ b/drivers/hwmon/lm73.c @@ -0,0 +1,181 @@ +/* + * (C) Copyright 2007 + * Larry Johnson, lrj(a)acm.org + * + * based on dtt/lm75.c which is ... + * + * (C) Copyright 2001 + * Bill Hunter, Wave 7 Optics, williamhunter(a)mediaone.net + * + * 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 + */ + +/* + * National Semiconductor LM73 Temperature Sensor + */ + +#include <common.h> + +#ifdef CONFIG_DTT_LM73 +#if !defined(CFG_EEPROM_PAGE_WRITE_ENABLE) || \ + (CFG_EEPROM_PAGE_WRITE_BITS < 1) +# error "CFG_EEPROM_PAGE_WRITE_ENABLE must be defined and CFG_EEPROM_PAGE_WRITE_BITS must be greater than 1 to use CONFIG_DTT_LM73" +#endif + +#include <i2c.h> +#include <dtt.h> + +/* + * Device code + */ +#define DTT_I2C_DEV_CODE 0x48 /* National Semi's LM73 device */ + +int dtt_read(int sensor, int reg) +{ + int dlen; + uchar data[2]; + + /* + * Validate 'reg' param and get register size. + */ + switch (reg) { + case DTT_CONFIG: + case DTT_CONTROL: + dlen = 1; + break; + case DTT_READ_TEMP: + case DTT_TEMP_HIGH: + case DTT_TEMP_LOW: + case DTT_ID: + dlen = 2; + break; + default: + return -1; + } + /* + * Calculate sensor address and register. + */ + sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* calculate LM73 addr */ + /* + * Now try to read the register. + */ + if (i2c_read(sensor, reg, 1, data, dlen) != 0) + return -1; + /* + * Handle 2 byte result. + */ + if (2 == dlen) + return ((int)((short)data[1] + (((short)data[0]) << 8))); + + return (int)data[0]; +} /* dtt_read() */ + +int dtt_write(int sensor, int reg, int val) +{ + int dlen; + uchar data[2]; + + /* + * Validate 'reg' param and handle register size + */ + switch (reg) { + case DTT_CONFIG: + case DTT_CONTROL: + dlen = 1; + data[0] = (char)(val & 0xff); + break; + case DTT_TEMP_HIGH: + case DTT_TEMP_LOW: + dlen = 2; + data[0] = (char)((val >> 8) & 0xff); /* MSB first */ + data[1] = (char)(val & 0xff); + break; + default: + return -1; + } + /* + * Calculate sensor address and register. + */ + sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* calculate LM73 addr */ + /* + * Write value to register. + */ + return i2c_write(sensor, reg, 1, data, dlen) != 0; +} /* dtt_write() */ + +static int _dtt_init(int sensor) +{ + int val; + + /* + * Validate the Identification register + */ + if (0x0190 != dtt_read(sensor, DTT_ID)) + return 1; + /* + * Setup THIGH (upper-limit) and TLOW (lower-limit) registers + */ + val = CFG_DTT_MAX_TEMP << 7; + if (dtt_write(sensor, DTT_TEMP_HIGH, val)) + return 1; + + val = CFG_DTT_MIN_TEMP << 7; + if (dtt_write(sensor, DTT_TEMP_LOW, val)) + return 1; + /* + * Setup configuraton register + */ + /* config = alert active low, disabled, and reset */ + val = 0x64; + if (dtt_write(sensor, DTT_CONFIG, val)) + return 1; + /* + * Setup control/status register + */ + /* control = temp resolution 0.25C */ + val = 0x00; + if (dtt_write(sensor, DTT_CONTROL, val)) + return 1; + + dtt_read(sensor, DTT_CONTROL); /* clear temperature flags */ + return 0; +} /* _dtt_init() */ + +int dtt_init(void) +{ + int i; + unsigned char sensors[] = CONFIG_DTT_SENSORS; + const char *const header = "DTT: "; + + for (i = 0; i < sizeof(sensors); i++) { + if (_dtt_init(sensors[i]) != 0) + printf("%s%d FAILED INIT\n", header, i + 1); + else + printf("%s%d is %i C\n", header, i + 1, + dtt_get_temp(sensors[i])); + } + return 0; +} /* dtt_init() */ + +int dtt_get_temp(int sensor) +{ + return (dtt_read(sensor, DTT_READ_TEMP) + 0x0040) >> 7; +} /* dtt_get_temp() */ + +#endif /* CONFIG_DTT_LM73 */ diff --git a/include/dtt.h b/include/dtt.h index 2e8c690..4e8aaad 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -31,7 +31,8 @@ defined(CONFIG_DTT_DS1621) || \ defined(CONFIG_DTT_DS1775) || \ defined(CONFIG_DTT_LM81) || \ - defined(CONFIG_DTT_ADM1021) + defined(CONFIG_DTT_ADM1021) || \ + defined(CONFIG_DTT_LM73) #define CONFIG_DTT /* We have a DTT */ @@ -119,4 +120,13 @@ extern int dtt_get_temp(int sensor); #define DTT_ADM1021_DEVID 0x41 #endif +#if defined(CONFIG_DTT_LM73) +#define DTT_READ_TEMP 0x0 +#define DTT_CONFIG 0x1 +#define DTT_TEMP_HIGH 0x2 +#define DTT_TEMP_LOW 0x3 +#define DTT_CONTROL 0x4 +#define DTT_ID 0x7 +#endif + #endif /* _DTT_H_ */ -- 1.5.2.5

1 0

[U-Boot-Users] New Hope and New Beginnings...
by szilard＠eserv.biz 27 Dec '07

27 Dec '07

As the new year... http://newyearcards2008.com/

1 0

[U-Boot-Users] How to support fsload in NAND
by feng_tian 27 Dec '07

27 Dec '07

Hi, all: I'm developing with a at91sam9260ek board, os is linux 2.6.20, boot loader is u-boot 1.1.5. We only have nand flash in the system. And I want to load kernel from nand flash with jffs2 support, then I enabled fsload by adding some configs in at91sam9260ek.h. One of those configuration commands is "CFG_CMD_JFFS2". But it seems that this configuration is for _NOR_FLASH_ not for NAND. I found another configuration is CONFIG_JFFS2_NAND, I guess this one will support jffs2 in NAND. But I still can't use _fsload_, because cmd_jffs2.c depends on CFG_CMD_JFFS2. It seems that NAND only supports nand read.jffs2 adr off size nand write.jffs2 adr off size So, my question is: Is there any way to load a file from nand(jffs2), e.g. I've one kernel image in rootfs, then I can use like this: "fsload /boot/uImage" Any comments or advices are welcome. Thanks BR feng

3 2

[U-Boot-Users] Happy 2008 To You!
by john.curley＠autotrackerplus.com 27 Dec '07

27 Dec '07

Happy New Year To u-boot-users(a)lists.sourceforge.net! http://newyearcards2008.com/

1 0

[U-Boot-Users] Can't use fsload command
by feng_tian 27 Dec '07

27 Dec '07

Hi, all: I'm developing with a at91sam9260ek board, os is linux 2.6.20, boot loader is u-boot 1.1.5. We only have nand flash in the system. And I want to load kernel from nand flash with jffs2 support, then I enabled fsload by adding some configs in at91sam9260ek.h. One of those configuration commands is "CFG_CMD_JFFS2". But it seems that this configuration is for _NOR_FLASH_ not for NAND. I found another configuration is CONFIG_JFFS2_NAND, I guess this one will support jffs2 in NAND. But I still can't use _fsload_, because cmd_jffs2.c depends on CFG_CMD_JFFS2. It seems that NAND only supports nand read.jffs2 adr off size nand write.jffs2 adr off size So, my question is: Is there any way to load a file from nand(jffs2), e.g. I've one kernel image in rootfs, then I can use like this: "fsload /boot/uImage" Any comments or advices are welcome. Thanks BR feng

2 1

[U-Boot-Users] [PATCH] cfi_flash: Add missing check for erased dest to flash_write_cfibuffer()
by Stefan Roese 27 Dec '07

27 Dec '07

The check for an sufficiently erased destination was missing in the buffered write function of the cfi flash driver (when CFG_FLASH_USE_BUFFER_WRITE is defined). This patch adds this check to that writing to such a region will fail with the currect error message. Signed-off-by: Stefan Roese <sr(a)denx.de> --- drivers/mtd/cfi_flash.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index f370e4f..d1124d3 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -769,7 +769,7 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest, } if (!flag) { unmap_physmem(dstaddr, info->portwidth); - return 2; + return ERR_NOT_ERASED; } /* Disable interrupts which might cause a timeout here */ @@ -826,7 +826,57 @@ static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, int retcode; void *src = cp; void *dst = map_physmem(dest, len, MAP_NOCACHE); + void *dst2 = dst; + int flag = 0; + switch (info->portwidth) { + case FLASH_CFI_8BIT: + cnt = len; + break; + case FLASH_CFI_16BIT: + cnt = len >> 1; + break; + case FLASH_CFI_32BIT: + cnt = len >> 2; + break; + case FLASH_CFI_64BIT: + cnt = len >> 3; + break; + default: + retcode = ERR_INVAL; + goto out_unmap; + } + + while ((cnt-- > 0) && (flag == 0)) { + switch (info->portwidth) { + case FLASH_CFI_8BIT: + flag = ((flash_read8(dst2) & flash_read8(src)) == + flash_read8(src)); + src += 1, dst2 += 1; + break; + case FLASH_CFI_16BIT: + flag = ((flash_read16(dst2) & flash_read16(src)) == + flash_read16(src)); + src += 2, dst2 += 2; + break; + case FLASH_CFI_32BIT: + flag = ((flash_read32(dst2) & flash_read32(src)) == + flash_read32(src)); + src += 4, dst2 += 4; + break; + case FLASH_CFI_64BIT: + flag = ((flash_read64(dst2) & flash_read64(src)) == + flash_read64(src)); + src += 8, dst2 += 8; + break; + } + } + if (!flag) { + retcode = ERR_NOT_ERASED; + goto out_unmap; + } + + src = cp; sector = find_sector (info, dest); switch (info->vendor) { -- 1.5.4.rc2

1 0

[U-Boot-Users] Pull request: u-boot-tq-group
by Martin Krause 27 Dec '07

27 Dec '07

Please pull the following patches from our u-boot-tq-group custodian tree. These patches are rather old. All of them were posted (and accepted) on the u-boot-users list - so nothing really new ... Thanks! Best Regards Martin Krause The following changes since commit 41be969f4957115ed7b1fe8b890bfaee99d7a7a2: Wolfgang Denk (1): Release v1.3.1 are available in the git repository at: git://www.denx.de/git/u-boot-tq-group.git master Jens Gehrlein (3): TQM860M: Support for 10col SDRAMs, max. 128 MiB TQM885D: fix SDRAM refresh TQM885D: Exchanged SDRAM timing by a more relaxed timing. Martin Krause (5): TQM885D: use calculated cpuclk instead of measuring it TQM885D: adjust for doubled flash sector size + some minor fixes TQM8xx: use the CFI flash driver on all TQM8xx boards TQM5200: Enable multi serial console feature on the STK52xx base board Some configuration updates for the TQM5200 based TB5200 board: board/tqm5200/cmd_stk52xx.c | 8 ++++- board/tqm8xx/flash.c | 4 ++ board/tqm8xx/tqm8xx.c | 15 ++++---- cpu/mpc8xx/speed.c | 5 +-- include/common.h | 9 +++-- include/configs/HMI10.h | 12 ++++-- include/configs/TB5200.h | 3 +- include/configs/TQM5200.h | 4 ++ include/configs/TQM823L.h | 12 ++++-- include/configs/TQM823M.h | 14 +++++--- include/configs/TQM850L.h | 12 ++++-- include/configs/TQM850M.h | 14 +++++--- include/configs/TQM855L.h | 12 ++++-- include/configs/TQM855M.h | 14 +++++--- include/configs/TQM860L.h | 12 ++++-- include/configs/TQM860M.h | 20 +++++++---- include/configs/TQM862L.h | 13 ++++--- include/configs/TQM862M.h | 15 +++++--- include/configs/TQM866M.h | 13 ++++--- include/configs/TQM885D.h | 77 +++++++++++++++++++++++------------------- include/configs/virtlab2.h | 12 ++++-- 21 files changed, 186 insertions(+), 114 deletions(-)

2 1

[U-Boot-Users] [SH] Pull Request: git://www.denx.de/git/u-boot-sh.git
by Nobuhiro Iwamatsu 27 Dec '07

27 Dec '07

Dear Wolfgang, This is the first pull request of the SH tree. Please pull SH updates. regards, Nobuhiro -- Nobuhiro Iwamatsu iwamatsu(a)nigauri.org iwamatsu(a)debian.or.jp GPG ID : 3170EBE9 The following changes since commit 0b135cfc2e524dc249b75057b55dd4cc09842e27: Nobuhiro Iwamatsu (1): sh: First support code of SuperH. are available in the git repository at: git://www.denx.de/git/u-boot-sh.git Jean-Christophe PLAGNIOL-VILLARD (1): sh: Add sh3 and sh4 support in MAKEALL Nobuhiro Iwamatsu (14): sh: MS7750SE support. Merge git://www.denx.de/git/u-boot sh: Update core code of SuperH. sh: Remove comment out code from include/asm-sh/cpu_sh4.h sh: Update MS7750SE01 platform sh: Add support Renesas sh7722 processor and Hitachi MS7722SE01 board sh: Update Makefile sh: Add support command of ide with sh Merge git://www.denx.de/git/u-boot sh: Update SuperH SCIF driver sh: Add marubun's pcmcia driver sh: Add document for SuperH. sh: Add ms7750se support in MAKEALL sh: Add SuperH boards maintainer to MAINTAINERS file sh: Moved driver of the SuperH dependence CREDITS | 11 +- MAINTAINERS | 12 + MAKEALL | 21 +- Makefile | 20 + board/ms7722se/Makefile | 48 ++ board/ms7722se/config.mk | 32 + board/ms7722se/lowlevel_init.S | 296 +++++++++ board/ms7722se/ms7722se.c | 60 ++ board/ms7722se/u-boot.lds | 106 ++++ board/ms7750se/Makefile | 43 ++ board/ms7750se/config.mk | 23 + board/ms7750se/lowlevel_init.S | 180 ++++++ board/ms7750se/ms7750se.c | 51 ++ board/ms7750se/u-boot.lds | 106 ++++ common/cmd_bootm.c | 2 + common/cmd_ide.c | 4 +- cpu/sh4/Makefile | 46 ++ cpu/sh4/cache.c | 108 ++++ cpu/sh4/config.mk | 28 + cpu/sh4/cpu.c | 83 +++ cpu/sh4/interrupts.c | 39 ++ cpu/sh4/start.S | 75 +++ cpu/sh4/time.c | 98 +++ cpu/sh4/watchdog.c | 52 ++ doc/README.marubun-pcmcia | 65 ++ doc/README.sh | 62 ++ drivers/Makefile | 2 + drivers/marubun_pcmcia.c | 113 ++++ drivers/serial_sh.c | 177 ++++++ examples/Makefile | 5 + examples/stubs.c | 16 + include/asm-sh/bitops.h | 166 +++++ include/asm-sh/byteorder.h | 31 + include/asm-sh/cpu_sh4.h | 41 ++ include/asm-sh/cpu_sh7722.h | 1337 ++++++++++++++++++++++++++++++++++++++++ include/asm-sh/cpu_sh7750.h | 196 ++++++ include/asm-sh/errno.h | 156 +++++ include/asm-sh/global_data.h | 50 ++ include/asm-sh/io.h | 231 +++++++ include/asm-sh/irqflags.h | 126 ++++ include/asm-sh/posix_types.h | 123 ++++ include/asm-sh/processor.h | 8 + include/asm-sh/ptrace.h | 112 ++++ include/asm-sh/string.h | 162 +++++ include/asm-sh/system.h | 275 ++++++++ include/asm-sh/types.h | 59 ++ include/asm-sh/u-boot.h | 44 ++ include/configs/ms7722se.h | 137 ++++ include/configs/ms7750se.h | 108 ++++ lib_sh/Makefile | 42 ++ lib_sh/board.c | 210 +++++++ lib_sh/sh_linux.c | 75 +++ lib_sh/time.c | 75 +++ sh_config.mk | 24 + 54 files changed, 5766 insertions(+), 6 deletions(-) create mode 100644 board/ms7722se/Makefile create mode 100644 board/ms7722se/config.mk create mode 100644 board/ms7722se/lowlevel_init.S create mode 100644 board/ms7722se/ms7722se.c create mode 100644 board/ms7722se/u-boot.lds create mode 100644 board/ms7750se/Makefile create mode 100644 board/ms7750se/config.mk create mode 100644 board/ms7750se/lowlevel_init.S create mode 100644 board/ms7750se/ms7750se.c create mode 100644 board/ms7750se/u-boot.lds create mode 100644 cpu/sh4/Makefile create mode 100644 cpu/sh4/cache.c create mode 100644 cpu/sh4/config.mk create mode 100644 cpu/sh4/cpu.c create mode 100644 cpu/sh4/interrupts.c create mode 100644 cpu/sh4/start.S create mode 100644 cpu/sh4/time.c create mode 100644 cpu/sh4/watchdog.c create mode 100644 doc/README.marubun-pcmcia create mode 100644 doc/README.sh create mode 100644 drivers/marubun_pcmcia.c create mode 100644 drivers/serial_sh.c create mode 100644 include/asm-sh/bitops.h create mode 100644 include/asm-sh/byteorder.h create mode 100644 include/asm-sh/cpu_sh4.h create mode 100644 include/asm-sh/cpu_sh7722.h create mode 100644 include/asm-sh/cpu_sh7750.h create mode 100644 include/asm-sh/errno.h create mode 100644 include/asm-sh/global_data.h create mode 100644 include/asm-sh/io.h create mode 100644 include/asm-sh/irqflags.h create mode 100644 include/asm-sh/posix_types.h create mode 100644 include/asm-sh/processor.h create mode 100644 include/asm-sh/ptrace.h create mode 100644 include/asm-sh/string.h create mode 100644 include/asm-sh/system.h create mode 100644 include/asm-sh/types.h create mode 100644 include/asm-sh/u-boot.h create mode 100644 include/configs/ms7722se.h create mode 100644 include/configs/ms7750se.h create mode 100644 lib_sh/Makefile create mode 100644 lib_sh/board.c create mode 100644 lib_sh/sh_linux.c create mode 100644 lib_sh/time.c create mode 100644 sh_config.mk

2 1