summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-07-07Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk
Conflicts: drivers/spi/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-07-07Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxxWolfgang Denk
2009-07-07Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk
2009-07-07Merge branch 'sf' of git://git.denx.de/u-boot-blackfinWolfgang Denk
2009-07-07Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk
2009-07-07UBI: Fix build problem noticed on Apollon (arm/testing repo)Stefan Roese
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>
2009-07-06sf: Macronix additional chips supportedPrafulla Wadaskar
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>
2009-07-06sf: sst: add sst25vf###b idsMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-07-06sf: sst: fix sector sizeMike Frysinger
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>
2009-07-06nhk8815: fix MAKEALLJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06MX31: Add NAND SPL boot support to i.MX31 PDK board.Magnus Lilja
Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
2009-07-06arm: Kirkwood: arch specific updated for ehci-Kirkwood driver supportPrafulla Wadaskar
This patch abstracts Kirkwood arch specific changes to support ehci-kirkwood driver Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2009-07-06arm nomadik: use 1000 as HZ value and rewrite timer codeAlessandro Rubini
This sets CONFIG_SYS_HZ to 1000 as required, and completely rewrites timer code, which is now both correct and much smaller. Unused functions like udelay_masked() have been removed as no driver uses them, even the ones that are not currently active for this board. mtu.h is copied literally from the kernel sources. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06arm nomadik: allow Nand and OneNand to coexistsAlessandro Rubini
The evaluation kit has both Nand and OneNand, both drivers are there and the two configurations only select a different default for the jffs partition. This adds the OneNand driver and cleans up storage. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
2009-07-06arm nomadik: cleanup resetAlessandro Rubini
There is only one public release of the Nomadik chip, so the ifdef in reset code as well as a define in the config file are not needed Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
2009-07-06arm nomadik: rename board to nhk8815Alessandro Rubini
This is an error in my side in the initial submission: nobody calls it ""nmdk8815", it's "nomadik hardware kit", nhk8815, instead. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
2009-07-06xscale: add support for the polaris boardStefano Babic
The Polaris board is based on the TrizepsIV module of Keith & Koep (http://www.keith-koep.com). Signed-off-by: Stefano Babic <sbabic@denx.de>
2009-07-06xscale: fix USB initialization for Trizepsiv moduleStefano Babic
Due to change in the usb_board_init() prototype, the USB for the TrizepsIV was not correctly initialized. Removed dummy print from usb_board_stop(). Signed-off-by: Stefano Babic <sbabic@denx.de>
2009-07-06net: merge bugfix: Marvell Kirkwood gigabit ethernet driverPrafulla Wadaskar
This patch looks okay on u-boot-net.git/next branch but when it was merged to u-boot.git/master the last line is missing Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Ben Warren <biggerbadderben@gmail.com>
2009-07-06at91: Add esd gmbh MEESC board supportDaniel Gorsulowski
This patch adds support for esd gmbh MEESC board. The MEESC is based on an Atmel AT91SAM9263 SoC. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
2009-07-06ARM: Update mach-typesJean-Christophe PLAGNIOL-VILLARD
update against linux v2.6.30 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06at91: Add CAN init functionDaniel Gorsulowski
To enable CAN init, CONFIG_CAN has to be defined in the board config file and at91_can_hw_init() has to be called in the board specific code. CAN is available on AT91SAM9263 and AT91CAP9 SoC. Signed-off-by: Daniel Gorsulowski <Daniel.Gorsulowski@esd.eu>
2009-07-06arm: Kirkwood: Correct header defineSimon Kagstrom
Correct define typo (. -> ,) Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
2009-07-06MX31: Add basic support for Freescale i.MX31 PDK board.Magnus Lilja
Add support for Freescale's i.MX31 PDK board (a.k.a. 3 stack board). This patch assumes that some other program performs the actual NAND boot. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Acked-by: Fabio Estevam <fabioestevam@yahoo.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06S3C24x0: extract interrupts from timerJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06dm355/pm9261: add missing CONFIG_NET_MULTIJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06arm920t/interrupts: Move conditional compilation to MakefileJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06move L2 cache enable/disable function to cache.c in the omap3 SoC directoryKim, Heung Jun
Signed-off-by: HeungJun, Kim <riverful.kim@samsung.com> CC: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-07-06ARM DaVinci: EMIF settingsThomas Lange
NAND module should not modify EMIF registers unrelated to CS2 that is used for NAND, i.e. do not modify EWAIT config register or registers for other Chip Selects. Without this patch, EMIF configurations made in board_init() will be invalidated. Signed-off-by: Thomas Lange <thomas@corelatus.se>
2009-07-06versatile: config coding style cleanupJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Peter Pearse <peter.pearse@arm.com>
2009-07-06arm: Kirkwood: Basic SOCs supportPrafulla Wadaskar
Kirkwood family controllers are highly integrated SOCs based on Feroceon-88FR131/Sheeva-88SV131/arm926ejs cpu core. SOC versions supported:- 1) 88F6281-A0 define CONFIG_KW88F6281_A0 2) 88F6192-A0 define CONFIG_KW88F6192_A0 Other supported features:- 1) get_random_hex() fucntion 2) PCI Express port initialization 3) NS16550 driver support 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>
2009-07-06arm: generic cache.h for ARM architecturesPrafulla Wadaskar
This patch is required for Kirkwood SoC support may be used by other ARM architectures Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2009-07-06OMAP3EVM: fix typo. replace CS6 by CS5, no functionality changeMatthias Ludwig
Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
2009-07-06at91sam9260/9263: add back up for the rst(reset controller).Sedji Gaouaou
On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was set to 0 after being set to 500 ms for the PHY reset. Do backup the old reset length and restore it after the MACB initialisation. Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com> Signed-off-by: Stelian Pop <stelian@popies.net>
2009-07-03fsl: Fix compiler warnings from gcc-4.4 in sys_eeprom codeKumar Gala
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>
2009-07-0283xx: Add support for fsl_dma driverPeter Tyser
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>
2009-07-0283xx: Replace CONFIG_ECC_INIT_VIA_DDRC referencesPeter Tyser
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>
2009-07-028xxx: Second UART port added for MPC85xx, MPC83xx, MPC86xx processorsPoonam Aggrwal
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>
2009-07-0285xx: Adds GPIO registers to MPC85xx Memory Map.Poonam Aggrwal
Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2009-07-0186xx: XPedite5170 board supportPeter Tyser
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>
2009-07-01fsl_ddr: Fix DDR3 calculation of rank density with 8GB or moreTimur Tabi
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>
2009-07-01fsl_dma: Make DMA transactions snoopablePeter Tyser
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>
2009-07-01fsl_dma: Break out common memory initialization functionPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2009-07-018xxx: Move dma_init() call to common codePeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2009-07-01fsl_dma: Move dma function prototypes to common header filePeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2009-07-018xxx: Rename dma_xfer() to dmacpy()Peter Tyser
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>
2009-07-01fsl_dma: Fix Channel Start bug in dma_check()Peter Tyser
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>
2009-07-01fsl_dma: Add support for arbitrarily large transfersPeter Tyser
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>
2009-07-01fsl_dma: Use proper I/O access functionsPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
2009-07-01fsl_dma: Add bitfield definitions for common registersPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>