summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk2009-07-07-1/+1
|\
| * UBI: Fix build problem noticed on Apollon (arm/testing repo)Stefan Roese2009-07-07-1/+1
| | | | | | | | | | | | | | | | | | This patch fixes a build problem noticed on Apollon by using mtd_dev_by_eb() instead of "/" as done in the Linux UBI version. So this brings the U-Boot UBI version more in sync with the Linux version again. Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'sf' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-07-07-16/+57
|\ \
| * | sf: Macronix additional chips supportedPrafulla Wadaskar2009-07-06-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new chips supported:- MX25L1605D, MX25L3205D, MX25L6405D, MX25L12855E out of which MX25L6405D and MX25L12855E tested on Kirkwood platforms Modified the Macronix flash support to use 2 bytes of device id instead of 1 This was required to support MX25L12855E Signed-off-by: Piyush Shah <spiyush@marvell.com> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sf: sst: add sst25vf###b idsMike Frysinger2009-07-06-0/+16
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sf: sst: fix sector sizeMike Frysinger2009-07-06-4/+4
| |/ | | | | | | | | | | | | | | Looks like when I was encoding the sector sizes, I forgot to divide by 8 (due to the stupid marketing driven process that declares all sizes in useless megabits and not megabytes). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2009-07-07-419/+1667
|\ \
| * | fsl: Fix compiler warnings from gcc-4.4 in sys_eeprom codeKumar Gala2009-07-03-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | sys_eeprom.c: In function 'do_mac': sys_eeprom.c:323: warning: dereferencing type-punned pointer will break strict-aliasing rules sys_eeprom.c: In function 'mac_read_from_eeprom': sys_eeprom.c:395: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 83xx: Add support for fsl_dma driverPeter Tyser2009-07-02-199/+96
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Reviewed-by: Ira W. Snyder <iws@ovro.caltech.edu> Tested-by: Ira W. Snyder <iws@ovro.caltech.edu> Acked-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 83xx: Replace CONFIG_ECC_INIT_VIA_DDRC referencesPeter Tyser2009-07-02-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 83xx architecture's CONFIG_ECC_INIT_VIA_DDRC references to CONFIG_ECC_INIT_VIA_DDRCONTROLLER, which other Freescale architectures use Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Acked-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 8xxx: Second UART port added for MPC85xx, MPC83xx, MPC86xx processorsPoonam Aggrwal2009-07-02-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defining the next two configs allows to switch the serial port from the console using the setenv stdin and stdout 1. #define CONFIG_SERIAL_MULTI 1 /* Enable both serial ports */ 2. #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 85xx: Adds GPIO registers to MPC85xx Memory Map.Poonam Aggrwal2009-07-02-0/+11
| | | | | | | | | | | | | | | Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 86xx: XPedite5170 board supportPeter Tyser2009-07-01-0/+1308
| | | | | | | | | | | | | | | | | | | | | | | | | | | Initial support for Extreme Engineering Solutions XPedite5170 - a MPC8640-based 3U VPX single board computer with a PMC/XMC site. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_ddr: Fix DDR3 calculation of rank density with 8GB or moreTimur Tabi2009-07-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The calculate for rank density in compute_ranksize() for DDR3 used all integers for the expression, so the result was also a 32-bit integer, even though the 'bsize' variable is a u64. Fix the expression to calculate a true 64-bit value. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Make DMA transactions snoopablePeter Tyser2009-07-01-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make DMA transactions snoopable so that CPUs can keep caches up-to-date. This allows dma transactions to be used for operations such as memory copies without any additional cache control operations. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Break out common memory initialization functionPeter Tyser2009-07-01-87/+38
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 8xxx: Move dma_init() call to common codePeter Tyser2009-07-01-5/+8
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Move dma function prototypes to common header filePeter Tyser2009-07-01-4/+5
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 8xxx: Rename dma_xfer() to dmacpy()Peter Tyser2009-07-01-59/+55
| | | | | | | | | | | | | | | | | | | | | | | | Also update dmacpy()'s argument order to match memcpy's and use phys_addr_t/phy_size_t for address/size arguments Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Fix Channel Start bug in dma_check()Peter Tyser2009-07-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Channel Start (CS) bit in the Mode Register (MR) should actually be cleared as the comment in the code suggests. Previously, CS was being set, not cleared. Assuming normal operation of the DMA engine, this change shouldn't have any real affect. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Add support for arbitrarily large transfersPeter Tyser2009-07-01-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | Support DMA transfers larger than the DMA controller's limit of (2 ^ 26 - 1) bytes Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Use proper I/O access functionsPeter Tyser2009-07-01-14/+18
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | fsl_dma: Add bitfield definitions for common registersPeter Tyser2009-07-01-6/+52
| | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 8xxx: Break out DMA code to a common filePeter Tyser2009-07-01-102/+102
| | | | | | | | | | | | | | | | | | | | | | | | DMA support is now enabled via the CONFIG_FSL_DMA define instead of the previous CONFIG_DDR_ECC Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 85xx: Add pci e1000 Ethernet support for P2020 boardRoy Zang2009-06-30-1/+3
| | | | | | | | | | | | | | | Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 8xxx: Fix PCI bus address setup for 36-bit configsKumar Gala2009-06-30-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want the outbound PCI memory map to end at the 4G boundary so we can maximize the amount of space available for inbound mappings if we have large amounts of memory. This matches the device tree setup in the kernel for the 36-bit physical configs for the platforms that have one (MPC8641 HPCN & MPC8572 DS). Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | 86xx: Add CPU_TYPE_ENTRY supportKumar Gala2009-06-30-13/+22
| |/ | | | | | | | | | | | | | | Unify with 83xx and 85xx and use CPU_TYPE_ENTRY. We are going to use this to convey the # of cores and DDR width in the near future so its good to keep in sync. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Blackfin: TWI/I2C: fix pure writesPeter Meerwald2009-06-30-2/+2
|/ | | | | | | | | | | If doing a pure write with register address and data (not a read/write combo transfer), we don't set the initial transfer length properly which ends up causing only the register address to be transferred. While we're here, fix the i2c_write() parameter description of the buffer. Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: move ALL += u-boot.ldr to blackfin_config.mkMike Frysinger2009-06-15-5/+5
| | | | | | | The way the ALL variable is used allows for config.mk's to add more targets themselves without having to clutter up the top level Makefile. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: fix SPI flash speed define nameMike Frysinger2009-06-15-11/+11
| | | | | | | The SPI flash define is named CONFIG_SF_DEFAULT_SPEED, not CONFIG_SF_DEFAULT_HZ, so fix the typos in the Blackfin boards. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: enable -O2 in lib_generic/ for ADI/Bluetechnix boardsMike Frysinger2009-06-15-0/+45
| | | | | | | Building the compression code in lib_generic/ with -O2 rather than -Os gives a nice speed boost without too much code size increase. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: bf548-ezkit: bump up monitor sizeMike Frysinger2009-06-15-1/+1
| | | | | | | The latest version of U-Boot got a bit fatter in the BSS section which caused overflows in the RAM region, so increase the monitor size. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: bf533-stamp/bf537-stamp: fix env settings for SPI flashVivi Li2009-06-15-4/+4
| | | | | | | | | The SPI flash layer is much stricter about sector usage than the eeprom layer we used to use, so update the env settings to better match the sector alignment of the flashes we use. Signed-off-by: Vivi Li <vivi.li@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Blackfin: bump up default JTAG console timeoutVivi Li2009-06-15-1/+1
| | | | | | | | | | The debug tools that interface with the other side of the JTAG console got much slower when generalizing things, so bump up the default timeout value on the U-Boot side to cope. Hopefully at some point we can improve the debug tools to speed things back up. Signed-off-by: Vivi Li <vivi.li@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* 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>