July 2010 - U-Boot

[U-Boot] Pull request - net
by Ben Warren 12 Jul '10

12 Jul '10

Wolfgang, The following changes since commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934: Wolfgang Denk (1): Make sure that argv[] argument pointers are not modified. are available in the git repository at: git://git.denx.de/u-boot-net.git master Albert Aribaud (2): kirkwood_egiga: bugfix: add DMA sequence points kirkwood_egiga: updates: fix DRAM mapping and typo Ben Warren (1): Write MAC address automatically on MACB-based boards Eric Bénard (2): at91_emac: Write MAC address automatically cpuat91: unbreak ethernet Heiko Schocher (1): tsec: add micrel ksz804 phy Hoan Hoang (3): AX88180: fix media typos AX88180: add support for the Marvell 88E1118 phy AX88180: make OUTW handle 32bit/16bit defines too Juergen Kilb (1): smc91xx_eeprom: Correct chip detection check. Mike Frysinger (7): net: dm9000x: re-add casts to I/O pointers to fix gcc warnings AX88180: add missing init prototype AX88180: improve phy searching AX88180: switch to common mii.h header net: warn about spaces in device names uli526x: drop newlines from device name AX88180: use standard I/O accessors Stefan Roese (1): net: Add option to disable fiber on M88E1111 PHY for PPC4xx Timur Tabi (1): tsec: fix the return value for tsec_eth_init() Vipin KUMAR (1): SPEAr : Network driver support added board/afeb9260/afeb9260.c | 7 - board/atmel/at91cap9adk/at91cap9adk.c | 7 - board/atmel/at91sam9260ek/at91sam9260ek.c | 7 - board/atmel/at91sam9263ek/at91sam9263ek.c | 7 - board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 7 - board/calao/sbc35_a9g20/sbc35_a9g20.c | 7 - board/eukrea/cpu9260/cpu9260.c | 7 - board/ronetix/pm9263/pm9263.c | 7 - doc/README.designware_eth | 25 + drivers/net/4xx_enet.c | 5 + drivers/net/Makefile | 1 + drivers/net/at91_emac.c | 60 ++- drivers/net/ax88180.c | 137 ++++--- drivers/net/ax88180.h | 104 ++--- drivers/net/designware.c | 531 +++++++++++++++++++++++ drivers/net/designware.h | 264 +++++++++++ drivers/net/dm9000x.c | 12 +- drivers/net/kirkwood_egiga.c | 19 +- drivers/net/macb.c | 23 +- drivers/net/tsec.c | 37 ++- drivers/net/uli526x.c | 2 +- examples/standalone/smc911x_eeprom.c | 2 +- include/configs/cpuat91.h | 9 +- include/netdev.h | 2 + net/eth.c | 3 + 25 files changed, 1075 insertions(+), 217 deletions(-) create mode 100644 doc/README.designware_eth create mode 100644 drivers/net/designware.c create mode 100644 drivers/net/designware.h regards, Ben

1 0

[U-Boot] [PATCH] kirkwood_egiga: updates: fix DRAM mapping and typo
by Albert Aribaud 12 Jul '10

12 Jul '10

DRAM window mapping uses kirkwood-provided functions instead of global gd as do other drivers--fix this. Also, fix a typo in a comment Signed-off-by: Albert Aribaud <albert.aribaud(a)free.fr> --- drivers/net/kirkwood_egiga.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c index 932792e..b7374b5 100644 --- a/drivers/net/kirkwood_egiga.c +++ b/drivers/net/kirkwood_egiga.c @@ -38,6 +38,8 @@ #include <asm/arch/kirkwood.h> #include "kirkwood_egiga.h" +DECLARE_GLOBAL_DATA_PTR; + #define KIRKWOOD_PHY_ADR_REQUEST 0xee #define KWGBE_SMI_REG (((struct kwgbe_registers *)KW_EGIGA0_BASE)->smi) @@ -245,9 +247,9 @@ static void set_dram_access(struct kwgbe_registers *regs) /* Enable full access */ win_param.access_ctrl = EWIN_ACCESS_FULL; win_param.high_addr = 0; - /* Get bank base */ - win_param.base_addr = kw_sdram_bar(i); - win_param.size = kw_sdram_bs(i); /* Get bank size */ + /* Get bank base and size */ + win_param.base_addr = gd->bd->bi_dram[i].start; + win_param.size = gd->bd->bi_dram[i].size; if (win_param.size == 0) win_param.enable = 0; else @@ -268,7 +270,7 @@ static void set_dram_access(struct kwgbe_registers *regs) win_param.attrib = EBAR_DRAM_CS3; break; default: - /* invalide bank, disable access */ + /* invalid bank, disable access */ win_param.enable = 0; win_param.attrib = 0; break; -- 1.6.4.4

3 2

[U-Boot] [PATCH v5 00/18] Network support for spear platforms and SPEAr1300
by Vipin KUMAR 12 Jul '10

12 Jul '10

Dear Wolfgang, Tom, The following set of patches is the fifth iteration of patches for the following changes -> Network device driver for synopsys designware peripheral -> SPEAr1300 SoC support -> A few other misc changes and bugfixes These also include the feedbacks given by Tom and Ben These set of patches are rebased on e5ed138a23923ebe61843244748d98d3dbc04777 Please include these changes in the mainline u-boot Regards Vipin Vipin KUMAR (18): change_bit routine defined SPEAr : SMI erase and write timeouts increased SPEAr : Placing ethaddr write and read within CONFIG_CMD_NET SPEAr : Reducing the max RAM size to 128MB SPEAr : Basic arch related support added for SPEAr SoCs SPEAr : Network driver support added SPEAr : Network support configured for spear SoCs SPEAr : macb driver support added for spear310 and spear320 SPEAr : FSMC driver support added SPEAr : Configuring FSMC driver for NAND interface SPEAr : i2c driver moved completely into drivers/i2c SPEAr : smi driver moved completely into drivers/mtd SPEAr : USB Device Controller driver support added SPEAr : Supporting various configurations for spear3xx and spear6xx boards SPEAr : Basic spear1300 architecture support added SPEAr : spear1300 SoC support added SPEAr : Removing extraneous code SPEAr : USB device controller bugfixes MAINTAINERS | 1 + MAKEALL | 1 + Makefile | 28 +- arch/arm/cpu/arm926ejs/spear/Makefile | 3 +- arch/arm/cpu/arm926ejs/spear/cpu.c | 78 +++ arch/arm/cpu/arm_cortexa8/spear13xx/Makefile | 52 ++ arch/arm/cpu/arm_cortexa8/spear13xx/cache.S | 114 +++++ arch/arm/cpu/arm_cortexa8/spear13xx/cpu.c | 96 ++++ .../arm_cortexa8/spear13xx/reset.c} | 52 +-- arch/arm/cpu/arm_cortexa8/spear13xx/timer.c | 138 +++++ .../arm/include/asm/arch-spear/clk.h | 26 +- arch/arm/include/asm/arch-spear/hardware.h | 16 +- arch/arm/include/asm/arch-spear/spr_misc.h | 5 + .../arm/include/asm/arch-spear13xx/hardware.h | 33 +- arch/arm/include/asm/arch-spear13xx/spr_gpt.h | 85 ++++ arch/arm/include/asm/arch-spear13xx/spr_misc.h | 317 ++++++++++++ .../arm/include/asm/arch-spear13xx/sys_proto.h | 29 +- arch/arm/include/asm/bitops.h | 11 +- board/spear/common/Makefile | 10 +- board/spear/common/spr_misc.c | 32 +- board/spear/spear1300/Makefile | 51 ++ board/spear/spear1300/config.mk | 28 + board/spear/spear1300/spear1300.c | 88 ++++ .../spear/spear1300/spr_lowlevel_init.S | 35 +- board/spear/spear300/config.mk | 11 - board/spear/spear300/spear300.c | 18 +- board/spear/spear310/config.mk | 11 - board/spear/spear310/spear310.c | 35 ++- board/spear/spear320/config.mk | 11 - board/spear/spear320/spear320.c | 23 +- board/spear/spear600/config.mk | 11 - board/spear/spear600/spear600.c | 18 +- doc/README.designware_eth | 25 + doc/README.spear | 46 ++- drivers/i2c/Makefile | 2 +- drivers/i2c/{spr_i2c.c => designware_i2c.c} | 4 +- .../spr_i2c.h => drivers/i2c/designware_i2c.h | 6 +- drivers/mtd/Makefile | 2 +- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/fsmc_nand.c | 366 ++++++++++++++ drivers/mtd/nand/spr_nand.c | 124 ----- drivers/mtd/{spr_smi.c => st_smi.c} | 59 ++- .../arch-spear/spr_smi.h => drivers/mtd/st_smi.h | 8 +- drivers/net/Makefile | 1 + drivers/net/designware.c | 531 ++++++++++++++++++++ drivers/net/designware.h | 264 ++++++++++ drivers/serial/usbtty.h | 4 +- drivers/usb/gadget/Makefile | 2 +- drivers/usb/gadget/{spr_udc.c => designware_udc.c} | 116 +++-- include/configs/spear-common.h | 33 +- include/configs/spear13xx_evb.h | 202 ++++++++ include/configs/{spear3xx.h => spear3xx_evb.h} | 30 ++ include/configs/{spear6xx.h => spear6xx_evb.h} | 13 + include/linux/mtd/fsmc_nand.h | 104 ++++ include/netdev.h | 1 + include/usb/{spr_udc.h => designware_udc.h} | 6 +- 56 files changed, 2997 insertions(+), 421 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/spear/cpu.c create mode 100644 arch/arm/cpu/arm_cortexa8/spear13xx/Makefile create mode 100644 arch/arm/cpu/arm_cortexa8/spear13xx/cache.S create mode 100644 arch/arm/cpu/arm_cortexa8/spear13xx/cpu.c rename arch/arm/{include/asm/arch-spear/spr_nand.h => cpu/arm_cortexa8/spear13xx/reset.c} (50%) mode change 100644 => 100755 create mode 100644 arch/arm/cpu/arm_cortexa8/spear13xx/timer.c copy include/configs/spear6xx.h => arch/arm/include/asm/arch-spear/clk.h (64%) copy include/configs/spear6xx.h => arch/arm/include/asm/arch-spear13xx/hardware.h (58%) create mode 100644 arch/arm/include/asm/arch-spear13xx/spr_gpt.h create mode 100644 arch/arm/include/asm/arch-spear13xx/spr_misc.h copy include/configs/spear6xx.h => arch/arm/include/asm/arch-spear13xx/sys_proto.h (64%) create mode 100644 board/spear/spear1300/Makefile create mode 100644 board/spear/spear1300/config.mk create mode 100644 board/spear/spear1300/spear1300.c copy include/configs/spear6xx.h => board/spear/spear1300/spr_lowlevel_init.S (56%) create mode 100644 doc/README.designware_eth rename drivers/i2c/{spr_i2c.c => designware_i2c.c} (98%) rename arch/arm/include/asm/arch-spear/spr_i2c.h => drivers/i2c/designware_i2c.h (98%) create mode 100644 drivers/mtd/nand/fsmc_nand.c delete mode 100644 drivers/mtd/nand/spr_nand.c rename drivers/mtd/{spr_smi.c => st_smi.c} (94%) rename arch/arm/include/asm/arch-spear/spr_smi.h => drivers/mtd/st_smi.h (96%) create mode 100644 drivers/net/designware.c create mode 100644 drivers/net/designware.h rename drivers/usb/gadget/{spr_udc.c => designware_udc.c} (91%) create mode 100644 include/configs/spear13xx_evb.h rename include/configs/{spear3xx.h => spear3xx_evb.h} (85%) rename include/configs/{spear6xx.h => spear6xx_evb.h} (82%) create mode 100644 include/linux/mtd/fsmc_nand.h rename include/usb/{spr_udc.h => designware_udc.h} (98%)

4 22

[U-Boot] [PATCH V2] kirkwood_egiga: bugfix: add DMA sequence points
by Albert Aribaud 12 Jul '10

12 Jul '10

Insert isb() sequence points to ensure DMA descriptors are filled in and set up before actual DMA occurs. Signed-off-by: Albert Aribaud <albert.aribaud(a)free.fr> --- PATCHSET HISTORY V1: initial submit V2: fixed badly placed isb() drivers/net/kirkwood_egiga.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c index 932792e..ea0c522 100644 --- a/drivers/net/kirkwood_egiga.c +++ b/drivers/net/kirkwood_egiga.c @@ -447,6 +447,8 @@ static int kwgbe_init(struct eth_device *dev) /* Assignment of Rx CRDB of given RXUQ */ KWGBEREG_WR(regs->rxcdp[RXUQ], (u32) dkwgbe->p_rxdesc_curr); + /* ensure previous write is done before enabling Rx DMA */ + isb(); /* Enable port Rx. */ KWGBEREG_WR(regs->rqc, (1 << RXUQ)); @@ -536,8 +538,13 @@ static int kwgbe_send(struct eth_device *dev, volatile void *dataptr, p_txdesc->buf_ptr = (u8 *) p; p_txdesc->byte_cnt = datasize; - /* Apply send command using zeroth TXUQ */ + /* Set this tc desc as zeroth TXUQ */ KWGBEREG_WR(regs->tcqdp[TXUQ], (u32) p_txdesc); + + /* ensure tx desc writes above are performed before we start Tx DMA */ + isb(); + + /* Apply send command using zeroth TXUQ */ KWGBEREG_WR(regs->tqc, (1 << TXUQ)); /* -- 1.6.4.4

3 2

[U-Boot] net, tsec: add micrel ksz804 phy
by Heiko Schocher 12 Jul '10

12 Jul '10

net, tsec: add micrel ksz804 phy Signed-off-by: Heiko Schocher <hs(a)denx.de> --- drivers/net/tsec.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 5fa6f61..bc2707f 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -1631,6 +1631,27 @@ static struct phy_info phy_info_dm9161 = { }, }; +/* micrel KSZ804 */ +static struct phy_info phy_info_ksz804 = { + 0x0022151, + "Micrel KSZ804 PHY", + 4, + (struct phy_cmd[]) { /* config */ + {PHY_BMCR, PHY_BMCR_RESET, NULL}, + {PHY_BMCR, PHY_BMCR_AUTON|PHY_BMCR_RST_NEG, NULL}, + {miim_end,} + }, + (struct phy_cmd[]) { /* startup */ + {PHY_BMSR, miim_read, NULL}, + {PHY_BMSR, miim_read, &mii_parse_sr}, + {PHY_BMSR, miim_read, &mii_parse_link}, + {miim_end,} + }, + (struct phy_cmd[]) { /* shutdown */ + {miim_end,} + } +}; + /* a generic flavor. */ static struct phy_info phy_info_generic = { 0, @@ -1794,6 +1815,7 @@ static struct phy_info *phy_info[] = { &phy_info_M88E1145, &phy_info_M88E1149S, &phy_info_dm9161, + &phy_info_ksz804, &phy_info_lxt971, &phy_info_VSC8211, &phy_info_VSC8244, -- 1.6.2.5 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH] net: dm9000x: re-add casts to I/O pointers to fix gcc warnings
by Mike Frysinger 12 Jul '10

12 Jul '10

The DM9000 in/out helper functions were casting the register address when it was accessing things directly (pre commit a45dde2293c816138e53c). But when it was changed to using the in/out helpers, those casts were dropped because those functions don't take pointers. Even more recently, those functions were then changed to use the read/write helpers, but the casts were not re-added. This is necessary because the read/write helpers do take pointers. Otherwise we get a lot of warnings like: dm9000x.c: In function 'dm9000_inblk_8bit': dm9000x.c:172: warning: passing argument 1 of 'readb' makes pointer from integer without a cast Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- drivers/net/dm9000x.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 137e41f..709f67a 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -117,12 +117,12 @@ static void DM9000_iow(int reg, u8 value); /* DM9000 network board routine ---------------------------- */ -#define DM9000_outb(d,r) writeb(d, r) -#define DM9000_outw(d,r) writew(d, r) -#define DM9000_outl(d,r) writel(d, r) -#define DM9000_inb(r) readb(r) -#define DM9000_inw(r) readw(r) -#define DM9000_inl(r) readl(r) +#define DM9000_outb(d,r) writeb(d, (volatile u8 *)(r)) +#define DM9000_outw(d,r) writew(d, (volatile u16 *)(r)) +#define DM9000_outl(d,r) writel(d, (volatile u32 *)(r)) +#define DM9000_inb(r) readb((volatile u8 *)(r)) +#define DM9000_inw(r) readw((volatile u16 *)(r)) +#define DM9000_inl(r) readl((volatile u32 *)(r)) #ifdef CONFIG_DM9000_DEBUG static void -- 1.7.1.1

3 2

[U-Boot] [PATCH v2] net: Add option to disable fiber on M88E1111 PHY for PPC4xx
by Stefan Roese 12 Jul '10

12 Jul '10

By defining CONFIG_M88E1111_DISABLE_FIBER boards can configure the M88E1111 PYH to disable fiber. This is needed for an upcoming PPC460GT based board, which has fiber/copper auto-selection enabled by default. This doesn't seem to work. So we disable fiber in the PHY register. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Ben Warren <biggerbadderben(a)gmail.com> --- v2: - Fixed spelling: fibre -> fiber drivers/net/4xx_enet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 2fac641..144b851 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -1095,6 +1095,11 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) miiphy_write (dev->name, reg, 0x18, 0x4101); miiphy_write (dev->name, reg, 0x09, 0x0e00); miiphy_write (dev->name, reg, 0x04, 0x01e1); +#if defined(CONFIG_M88E1111_DISABLE_FIBER) + miiphy_read(dev->name, reg, 0x1b, &reg_short); + reg_short |= 0x8000; + miiphy_write(dev->name, reg, 0x1b, reg_short); +#endif #endif #if defined(CONFIG_M88E1112_PHY) if (bis->bi_phymode[devnum] == BI_PHYMODE_SGMII) { -- 1.7.1

2 1

[U-Boot] Allocating memory in u-boot application
by prathika 12 Jul '10

12 Jul '10

hi, I am working on PPC440EP base custom board. I managed to port u-boot successfully. The requirement is, there should be no OS running on-board and run an application in u-boot. I have successfully ported and example application also. The part of my requirement is to read data as large as 10MB from NVRAM and load it to PC. I am not able to allocate more than 64kB to a buffer. When i allocate even 1MB, my application hangs when i try to access the buffer. I have 64MB DDR-RAM interface to PPC440EP. The size of my application is 300kB and i don't think u-boot uses large memory. How can I malloc big size to a buffer in this case. Please help me fix this issue, thanks in advance. Regards, Prathika R

1 0

[U-Boot] Hi!
by Мария Сергеева 10 Jul '10

10 Jul '10

Hi 2 all! Good subscrubtion, thx! ________________________________________________ http://stydentkam.ru , http://ekzameny.net , http://referat-na-5.ru , http://hellocafe.ru , http://home-happy.ru , http://samkon.ru , http://scouts-russia.ru , http://bestxenon.ru , http://harmonia-plus.ru , http://kond-galereya.ru , http://divi-media.ru , http://v-peremen.ru , http://tonyfill.ru , http://v-peremen.ru , http://tbcom.ru , http://informkom.ru , http://aidsprint.ru , http://stydentam.ru , http://virtuallight.ru

1 0

[U-Boot] [PATCH] kirkwood_egiga: bugfix: add DMA sequence points
by Albert Aribaud 10 Jul '10

10 Jul '10

Insert isb() sequence points to ensure DMA descriptors are filled in and set up before actual DMA occurs. Signed-off-by: Albert Aribaud <albert.aribaud(a)free.fr> --- drivers/net/kirkwood_egiga.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c index 932792e..ea0c522 100644 --- a/drivers/net/kirkwood_egiga.c +++ b/drivers/net/kirkwood_egiga.c @@ -447,6 +447,8 @@ static int kwgbe_init(struct eth_device *dev) /* Assignment of Rx CRDB of given RXUQ */ KWGBEREG_WR(regs->rxcdp[RXUQ], (u32) dkwgbe->p_rxdesc_curr); + /* ensure previous write is done before enabling Rx DMA */ + isb(); /* Enable port Rx. */ KWGBEREG_WR(regs->rqc, (1 << RXUQ)); @@ -536,8 +538,13 @@ static int kwgbe_send(struct eth_device *dev, volatile void *dataptr, p_txdesc->buf_ptr = (u8 *) p; p_txdesc->byte_cnt = datasize; - /* Apply send command using zeroth TXUQ */ + /* Set this tc desc as zeroth TXUQ */ KWGBEREG_WR(regs->tcqdp[TXUQ], (u32) p_txdesc); + + /* ensure tx desc writes above are performed before we start Tx DMA */ + isb(); + + /* Apply send command using zeroth TXUQ */ KWGBEREG_WR(regs->tqc, (1 << TXUQ)); /* -- 1.6.4.4

3 2