summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-09-03-29/+191
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2008-09-03-29/+191
| |\
| | * mpc83xx: fix mpc8313 in-tree building with NANDNick Spence2008-09-03-1/+4
| | | | | | | | | | | | | | | | | | | | | and add mpc8313 NAND build to MAKEALL Signed-off-by: Nick Spence <nick.spence@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * mpc83xx: clean up cache operations and unlock_ram_in_cache() functionsNick Spence2008-09-03-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans up some latent issues with the data cache control so that dcache_enable() and dcache_disable() will work reliably (after unlock_ram_in_cache() has been called) Signed-off-by: Nick Spence <nick.spence@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * mpc83xx: Store and display Arbiter Event Register valuesNick Spence2008-09-03-1/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record the Arbiter Event Register values and optionally display them. The Arbiter Event Register can record the type and effective address of an arbiter error, even through an HRESET. This patch stores the values in the global data structure. Display of the Arbiter Event registers immediately after the RSR value can be enabled with defines. The Arbiter values will only be displayed if an arbiter event has occured since the last Power On Reset, and either of the following defines exist: #define CONFIG_DISPLAY_AER_BRIEF - display only the arbiter address and and type register values #define CONFIG_DISPLAY_AER_FULL - display and interpret the arbiter event register values Address Only transactions are one of the trapped events that can register as an arbiter event. They occur with some cache manipulation instructions if the HID0_ABE (Address Broadcast Enable) is set and the memory region has the MEMORY_COHERENCE WIMG bit set. Setting: #define CONFIG_MASK_AER_AO - prevents the arbiter from recording address only events, so that it can still capture other real problems. Signed-off-by: Nick Spence <nick.spence@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * mpc83xx: use r4 instead of r2 in lock_ram_in_cache and unlock_ram_in_cacheNick Spence2008-09-03-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in unlock_ram_in_cache() because it is called from C and will corrupt the small data area anchor that is kept in R2. lock_ram_in_cache() is modified similarly as good coding practice, but is not called from C. Signed-off-by: Nick Spence <nick.spence@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * MPC83XX: Fix GPIO configuration - set gpio level before directionNick Spence2008-09-03-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set DAT value before DIR values to avoid creating glitches on the GPIO signals. Set gpio level register before direction register to inhibit glitches on high level output pins. Dir and data gets cleared at powerup, so high level output lines see a short low pulse between setting the direction and level registers. Issue was seen on a new board with the nReset line of the NOR flash connected to a GPIO. Setting the direction register puts the NOR flash in reset so the next instruction to set the level cannot get executed. Signed-off-by: Nick Spence <nick.spence@freescale.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | | Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-09-03-847/+1207
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.denx.de/u-boot-mipsWolfgang Denk2008-09-03-1/+63
| |\ \
| | * | doc/qemu_mips: add doc howto debug u-boot with gdbJean-Christophe PLAGNIOL-VILLARD2008-09-04-1/+63
| | |/ | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2008-09-03-550/+131
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: board/esd/dasa_sim/dasa_sim.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * | ppx4xx: Fix broken DASA_SIM boardMatthias Fuchs2008-09-03-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds initdram() to DASA_SIM boards that has been removed accidentally by a previous commit. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Remove reference to common/lists.o from some esd linker scriptsStefan Roese2008-09-03-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes some direct references to common/lists.o from some esd linker scripts. This is necessary because the lists source was moved and is not in the "common" directory anymore. Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Remove obsolete or unused functions from some esd boardsMatthias Fuchs2008-09-03-326/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes initdram() and testdram() from most esd 405 platforms. Some boards also have an empty dummy implementation of misc_init_f(). This is also removed. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Update VOM405 board configurationMatthias Fuchs2008-09-03-43/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove PCI code - add command line editing - minor cleanup Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Remove obsolete initdram() function from VOM405 boardMatthias Fuchs2008-09-03-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removed the obsolete initdram() function from VOM405 platform file. Some minor cleanup. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Cleanup VOM405 linker scriptMatthias Fuchs2008-09-03-12/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Add fdt support for VOM405 boardsMatthias Fuchs2008-09-03-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <mf@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Coding style cleanupMatthias Fuchs2008-09-03-83/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap long lines etc. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Enable USB on PLU405 boardsMatthias Fuchs2008-09-03-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the PCI-OHCI controller on PLU405 board. Also the default CPU frequency is updated to 266 MHz and command line editing is enabled. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Cleanup PLU405 platform fileMatthias Fuchs2008-09-03-37/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch - wraps some long lines - removes unused/obsolete functions: misc_init_f() and initdram() Signed-off-by: Matthias Fuchs <mf@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Cleanup PLU405 linker scriptMatthias Fuchs2008-09-03-14/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <mf@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Add fdt support for PLU405 boardsMatthias Fuchs2008-09-03-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <mf@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| | * | ppc4xx: Increase U-Boot size to 384kB for PLU405 boardsMatthias Fuchs2008-09-03-5/+4
| | |/ | | | | | | | | | | | | Signed-off-by: Matthias Fuchs <mf@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2008-09-03-301/+1018
| |\ \ | | |/ | |/|
| | * Don't tftp to unknown flashJochen Friedrich2008-09-02-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a board has a variable number of flash banks, there are empty entries in flash_info[] and CFG_DIRECT_FLASH_TFTP is set, tftp boot fails with "Outside available Flash". This patch skips flash banks with unknown flash ids. Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * net: smc911x: Add pkt_data_pull and pkt_data_push functionNobuhiro Iwamatsu2008-09-02-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RSK7203 board has the SMSC9118 wired up 'incorrectly'. Byte-swapping is necessary, and so poor performance is inevitable. This problem cannot evade by the swap function of CHIP, this can evade by software Byte-swapping. And this has problem by FIFO access only. pkt_data_pull/pkt_data_push functions necessary to solve this problem. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of EEPRO100 Ethernet controller to board_eth_init()Ben Warren2008-09-02-4/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: db64360 db64460 katmai taihu taishan yucca cpc45 cpu87 eXalion elppc debris kvme080 mpc8315erdb integratorap ixdp425 oxc pm826 pm828 pm854 pm856 ppmc7xx sc3 sc520_spunk sorcery tqm8272 tqm85xx utx8245 Removed initialization of the driver from net/eth.c Also, wrapped contents of pci_eth_init() by CONFIG_PCI. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of TULIP Ethernet controller to board_eth_init()Ben Warren2008-09-02-4/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: cu824 bab7xx adciop dasa_sim mousse mpc8540eval musenki mvblue pcippc2/pcippc6 sbc8240 stxssa Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of E1000 Ethernet controller to board_eth_init()Ben Warren2008-09-02-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: ap1000 mvbc_p PM854 Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of plb2800 Ethernet driver to board_eth_initBen Warren2008-09-02-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: purple Removed initialization of controller from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of MPC5xxx_FEC Ethernet driver to CPU directoryBen Warren2008-09-02-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified board_eth_init() functions of boards that have this FEC in addition to other Ethernet controllers. Affected boards: bc3450 icecube mvbc_p o2dnt pm520 total5200 tq5200 Removed initialization of controller from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of MPC512x_FEC Ethernet driver to CPU directoryBen Warren2008-09-02-4/+15
| | | | | | | | | | | | | | | | | | | | | Added a cpu_eth_init() function to MPC512x CPU directory and removed code from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of IncaIP Ethernet controller to board_eth_initBen Warren2008-09-02-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: IncaIP Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of 3COM Ethernet controller (AmigaOne) to board_eth_init()Ben Warren2008-09-02-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: AmigaOneG3SE Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of GT6426x Ethernet controller to board_eth_init()Ben Warren2008-09-02-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: EVB64260 P3G4 ZUMA Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of PCNET Ethernet controller to board_eth_init()Ben Warren2008-09-02-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: PN62 sc520_cdp Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of NATSEMI Ethernet controller to board_eth_init()Ben Warren2008-09-02-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: a3000 Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of NS8382X Ethernet controller to board_eth_init()Ben Warren2008-09-02-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: bc3450 cpci5200 mecp5200 pf2000 icecube o2dnt pm520 sandpoint8245 total5200 tqm5200 Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of TSI108 Ethernet controller to board_eth_init()Ben Warren2008-09-02-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: mpc7448hpc2 Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of RTL8139 Ethernet controller to board_eth_init()Ben Warren2008-09-02-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: hidden_dragon MPC8544DS MPC8610HPCN R2DPLUS TB0229 Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of RTL8169 Ethernet controller to board_eth_init()Ben Warren2008-09-02-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Affected boards: linkstation r7780mp Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Moved initialization of Ethernet controllers on Atmel AT91 to board_eth_init()Ben Warren2008-09-02-41/+33
| | | | | | | | | | | | | | | | | | Removed at91sam9_eth_initialize() from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Introduce netdev.h header file and remove externsBen Warren2008-09-02-34/+88
| | | | | | | | | | | | | | | | | | | | | This addresses all drivers whose initializers have already been moved to board_eth_init()/cpu_eth_init(). Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Add pixis_set_sgmii commandAndy Fleming2008-09-02-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 8544DS and 8572DS platforms support an optional SGMII riser card to expose ethernet over an SGMII interface. Once the card is in, it is also necessary to configure the board such that it uses the card, rather than the on-board ethernet ports. This can either be done by flipping dip switches on the motherboard, or by modifying registers in the pixis. Either way requires a reboot. This adds a command to allow users to choose which ports are routed through the SGMII card, and which through the onboard ports. It also allows users to revert to the current switch settings. This code does not work on the 8572, as the PIXIS is different. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Add SGMII support for the 8544 DSAndy Fleming2008-09-02-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | The 8544 DS has an optional SGMII Riser card, which uses different PHY addresses. Check if we are in SGMII mode, and invoke the SGMII Riser setup code if so. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Add support for Freescale SGMII Riser CardAndy Fleming2008-09-02-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 8544DS and 8572DS systems have an optional SGMII riser card which exposes new ethernet ports which are connected to the eTSECs via an SGMII interface. The SGMII PHYs for this board are offset from the standard PHY addresses, so this code modifies the passed in tsec_info structure to use the SGMII PHYs on the card, instead. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Add SGMII support to the tsecAndy Fleming2008-09-02-27/+72
| | | | | | | | | | | | | | | | | | | | | Adds support for configuring the TBI to talk properly with the SerDes. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * Pass in tsec_info struct through tsec_initializeAndy Fleming2008-09-02-122/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tsec driver contains a hard-coded array of configuration information for the tsec ethernet controllers. We create a default function that works for most tsecs, and allow that to be overridden by board code. It creates an array of tsec_info structures, which are then parsed by the corresponding driver instance to determine configuration. Also, add regs, miiregs, and devname fields to the tsec_info structure, so that we don't need the kludgy "index" parameter. Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| | * tsec: Move tsec.h to include/Andy Fleming2008-09-02-7/+7
| | | | | | | | | | | | | | | | | | | | | This is to prepare the way for board code passing in the tsec_info structure Signed-off-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>