summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-06-15-219/+1944
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-06-15-219/+1944
| |\
| | * Convert DM9000 driver for CONFIG_NET_MULTIRemy Bohmer2009-06-15-17/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | All drivers need to be converted to CONFIG_NET_MULTI. This patch converts the dm9000 driver. Signed-off-by: Thomas Smits <ts.smits@gmail.com> Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * net: Add Marvell Kirkwood gigabit ethernet driverPrafulla Wadaskar2009-06-15-0/+1169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a egiga driver for the Marvell Kirkwood SoC's. Contributors: Yotam Admon <yotam@marvell.com> Michael Blostein <michaelbl@marvell.com Reviewed-by: Ronen Shitrit <rshitrit@marvell.com> Acked-by: Stefan Rose <sr@denx.de> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * DaVinci Network Driver Updatess-paulraj@ti.com2009-06-15-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different flavours of DaVinci SOC's have differences in their EMAC IP This patch does the following 1) Updates base addresses for DM365 2) Updates MDIO frequencies for DM365 and DM646x 3) Update EMAC wrapper registers for DM365 and DM646x Patch applies to u-boot-net git. the EMAC driver itself will be updated shortly to add support for DM365 and DM646x Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Subject: [PATCH] [repost] Standardize the use of MCFFEC_TOUT_LOOP as a ↵Richard Retanubun2009-06-15-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udelay(1) loop counter. From 584b5fbd4abfc43f920cc1c329633e03816e28be Mon Sep 17 00:00:00 2001 From: Richard Retanubun <RichardRetanubun@RuggedCom.com> Date: Wed, 20 May 2009 18:26:01 -0400 Subject: [PATCH] Standardize the use of MCFFEC_TOUT_LOOP as a udelay(1) loop counter. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * A VLAN tagged DHCP request/discover is 4 bytes shortNorbert van Bolhuis2009-06-15-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that BOOTP_SIZE uses ETHER_HDR_SIZE which is 14 bytes. If sending a VLAN tagged frame (when env variable vlan is set) this should be VLAN_ETHER_HDR_SIZE=18 which is what NetSetEther returns. Signed-off-by: Norbert van Bolhuis <nvbolhuis@aimvalley.nl> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Remove support for non-CONFIG_NET_MULTI on PPC4xx EMACBen Warren2009-06-15-58/+0
| | | | | | | | | | | | Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Switched davinci_emac Ethernet driver to use newer APIBen Warren2009-06-15-63/+41
| | | | | | | | | | | | | | | | | | | | | | | | Added CONFIG_NET_MULTI to all Davinci boards Removed all calls to Davinci network driver from board code Added cpu_eth_init() to cpu/arm926ejs/cpu.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Initial cleanup of Davinci Ethernet driverBen Warren2009-06-15-77/+69
| | | | | | | | | | | | | | | | | | | | | Removed pointless #ifdefs Moved functions around in file in preparation for switch to newer API Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved Davinci Ethernet driver to drivers/netBen Warren2009-06-15-1/+2
| | | | | | | | | | | | | | | | | | This driver has been renamed davinci_emac.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Marvell MV88E61XX Switch Driver supportPrafulla Wadaskar2009-06-15-0/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chips supported:- 1. 88E6161 6 port gbe swtich with 5 integrated PHYs 2. 88E6165 6 port gbe swtich with 5 integrated PHYs 2. 88E6132 3 port gbe swtich with 2 integrated PHYs Platform specific configuration supported for:- default or router port vlan configuration led_init configuration mdip/n polarity reversal configuration Note: This driver is supported and tested against kirkwood egiga interface Contributors: Yotam Admon <yotam@marvell.com> Michael Blostein <michaelbl@marvell.com Reviewed by: Ronen Shitrit <rshitrit@marvell.com> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * tsec: Add support for BCM5482S PHYZach LeRoy2009-06-15-0/+43
| | | | | | | | | | | | | | | | | | Signed-off-by: Zach LeRoy <zleroy@xes-inc.com> Acked-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | Blackfin: add jtagconsole helper scriptMike Frysinger2009-06-15-0/+39
|/ / | | | | | | | | | | | | This script is similar to the netconsole script, but instead works with the JTAG console device driver that exists on Blackfin parts. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: unify u-boot linker scriptsMike Frysinger2009-06-14-2795/+162
| | | | | | | | | | | | | | | | | | | | | | All the Blackfin linker scripts were duplicated across the board dirs with no difference save from the semi-often used ENV_IS_EMBEDDED option. So unify all of them in the lib_blackfin/ dir and for the few boards that need to embedded the environment directly, add a LDS_BOARD_TEXT define for them to customize via their board config file. This is much simpler than forcing them to duplicate the rest of the linker script. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: bf518f-ezbrd: enable SST SPI flash driverMike Frysinger2009-06-14-0/+1
| | | | | | | | | | | | | | The BF51xF parts have an internal SST SPI flash, so make sure the driver is enabled by default so we can access it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: convert specific pre/post config headers to common methodMike Frysinger2009-06-14-231/+166
| | | | | | | | | | | | | | | | | | | | The Blackfin port was using asm/blackfin-config-{pre,post}.h to setup common Blackfin board defines. The common method now is to use config.h, so convert blackfin-config-post.h to that. Rename the still Blackfin specific blackfin-config-pre.h to config-pre.h so the naming conventions at least line up. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: enable LZMA for all ADI boardsMike Frysinger2009-06-14-0/+5
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: make default ADI env more flexibleMike Frysinger2009-06-14-5/+25
| | | | | | | | | | | | | | | | Allow boards to easily override the root= and default bootcmd, allow people to tweak the file used in default bootcmds at runtime via one env var, and add a stock nandboot command. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: ibf-dsp561: new board portHoan Hoang2009-06-14-0/+408
| | | | | | | | | | Signed-off-by: Hoan Hoang <hnhoan@i-syst.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: blackstamp: new board portMike Frysinger2009-06-14-2/+562
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: bf537-srv1: new board portMike Frysinger2009-06-14-2/+498
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: bf537-minotaur: new board portMike Frysinger2009-06-14-1/+504
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: bf537-pnav: new board portMike Frysinger2009-06-14-1/+465
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: cm-bf527: new board portMike Frysinger2009-06-14-2/+581
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: cm-bf548: new board portMike Frysinger2009-06-14-2/+782
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: tcm-bf537: new board portMike Frysinger2009-06-14-2/+531
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: cm-bf561: new board portMike Frysinger2009-06-14-2/+374
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: cm-bf537e: new board portMike Frysinger2009-06-14-2/+525
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: cm-bf533: new board portMike Frysinger2009-06-14-0/+373
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: new spibootldr commandMike Frysinger2009-06-14-0/+65
| | | | | | | | | | | | | | Newer Blackfin parts can an on-chip ROM that can boot LDRs over SPI flashes, so add a new 'spibootldr' command to take advantage of it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Blackfin: support embedding the environment into loader files (LDRs)Mike Frysinger2009-06-14-0/+8
|/ | | | | | | | For the most part, the Blackfin processor boots files in the LDR format rather than binary/ELF files. So we want to export the environment as a raw blob to the LDR utility so it can embed it at the right location. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* add %.c->%.i and %.c->%.s rulesMike Frysinger2009-06-14-0/+4
| | | | | | | | | | | The Linux kernel has some helper rules which allow you to quickly produce some of the intermediary files from C source. Specifically, you can create .i files which is the preprocessed output and you can create .s files which is the assembler output. This is useful when you are trying to track down header/macro expansion errors or inline assembly errors. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* make sure toplevel $(SUBDIRS) is always declaredMike Frysinger2009-06-14-8/+8
| | | | | | | | | The $(SUBDIRS) variable is only declared when U-Boot has been configured, but it gets used all the time. In the non-configured case, it is used to generate a helpful error message, but it needs to be set properly for that to occur. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* allow boards to customize compiler options on a per-file/dir basisMike Frysinger2009-06-14-3/+5
| | | | | | | | | | | | | | With our Blackfin boards, we like to build the compression routines with -O2 as our tests show a pretty good size/speed tradeoff. For the rest of U-Boot though, we want to stick with the default -Os as that is mostly control code. So in our case, we would add a line like so to the board specific config.mk file: CFLAGS_lib_generic += -O2 Now all files under lib_generic/ will have -O2 appended to their build. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Merge branch 'next' of ../masterWolfgang Denk2009-06-14-17280/+15003
|\
| * xes: Update Freescale clock code to work with 86xx processorsPeter Tyser2009-06-12-1/+10
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * xes: Update Freescale DDR code to work with 86xx processorsPeter Tyser2009-06-12-2/+8
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * xes: Update Freescale PCI code to work with 86xx processorsPeter Tyser2009-06-12-10/+73
| | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Add PORBMSR and PORDEVSR shift definesPeter Tyser2009-06-12-0/+2
| | | | | | | | | | | | | | | | | | Add defines similar to those already used for the the 86xx architecture. This will ease sharing of PCI code between the 85xx and 86xx architectures. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * fsl/85xx, 86xx: Sync up DMA codePeter Tyser2009-06-12-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following changes were made to sync up the DMA code between the 85xx and 86xx architectures which will make it easier to break out common 8xxx DMA code: 85xx: - Don't set STRANSINT and SPCIORDER fields in SATR register. These bits only have an affect when the SBPATMU bit is set. - Write 0xffffffff instead of 0xfffffff to clear errors in the DMA status register. We may as well clear all 32 bits of the register... 86xx: - Add CONFIG_SYS_MPC86xx_DMA_ADDR define to address DMA registers - Add clearing of errors in the DMA status register when initializing the controller - Clear the channel start bit in the DMA mode register after a transfer Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * fsl: Create common fsl_dma.h for 85xx and 86xx cpusPeter Tyser2009-06-12-172/+89
| | | | | | | | | | | | | | | | Break out DMA structures for the Freescale MPC85xx and MPC86xx cpus to reduce a large amount of code duplication Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Add UEC6 and UEC8 at SGMII mode for MPC8569MDSHaiying Wang2009-06-12-0/+25
| | | | | | | | | | | | | | | | | | On MPC8569MDS board, UCC6 and UCC8 can be configured to work at SGMII mode via UEM on PB board. Since MPC8569 supports up to 4 Gigabit Ethernet ports, we disable UEC6 and UEC8 by default. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * drivers/qe: add sgmii support in for UEC driverHaiying Wang2009-06-12-2/+46
| | | | | | | | | | Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * qe: Pass in uec_info struct through uec_initializeHaiying Wang2009-06-12-222/+65
| | | | | | | | | | | | | | | | | | | | | | The uec driver contains code to hard code configuration information for the uec ethernet controllers. This patch creates an array of uec_info structures, which are then parsed by the corresponding driver instance to determine configuration. It also creates function uec_standard_init() to initialize all UEC interfaces for 83xx and 85xx. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * fsl: Update the number of ethxaddr in reading system eepromHaiying Wang2009-06-12-5/+18
| | | | | | | | | | | | | | | | | | We support up to 8 mac addresses in system eeprom, so we define the macro MAX_NUM_PORTS to limit the mac_count to 8, and update the number of ethxaddr according to mac_count. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Add RMII support for MPC8569MDSHaiying Wang2009-06-12-7/+144
| | | | | | | | | | | | | | | | | | This patch supports UCC working at RMII mode on PIB board, fixup fdt blob to support rmii in kernel. It also changes the name of enable_mpc8569mds_qe_mdio to enalbe_mpc8569mds_qe_uec which is more accurate. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Add UEC3 and UEC4 support for MPC8569MDSHaiying Wang2009-06-12-0/+57
| | | | | | | | | | Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * drivers/qe: Add more SNUM number for QEHaiying Wang2009-06-12-5/+16
| | | | | | | | | | | | | | | | | | Some QE chips like 8569 need more SNUM numbers for supporting 4 UECs in RGMII- 1000 mode. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * drivers/qe: Change QE RISC ALLOCATION to support 4 RISCsHaiying Wang2009-06-12-12/+52
| | | | | | | | | | | | | | | | | | Also define the QE_RISC_ALLOCATION_RISCs to MACROs instead of using enum, and define MAX_QE_RISC for QE based silicons. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>