summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Makefile: need to remove generated u-boot-nand_spl.ldsKumar Gala2011-07-01-1/+1
| | | | | | | | On MPC85xx based NAND_SPL builds we generate a u-boot-nand_spl.lds based on output from preprocessor. We where never removed it. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Scott Wood <scottwood@freescale.com>
* NAND: Add 16bit NAND support for the NDFCAlex Waterman2011-07-01-7/+45
| | | | | | | | | | | | | | | | | | | This patch adds support for 16 bit NAND devices attached to the NDFC on ppc4xx processors. Two config entries were added: CONFIG_SYS_NDFC_16 - Setting this tells the NDFC that a 16 bit device is attached. CONFIG_SYS_NDFC_EBC0_CFG - This is for the External Bus Controller configuration register. Also, a new ndfc_read_byte() function was added which does not first convert the data to little endian. The NAND SPL was also modified to do 16bit bad block testing when a 16 bit chip is being used. Signed-off-by: Alex Waterman <awaterman@dawning.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* cmd_nand: add nand write.trimffs commandBen Gardiner2011-07-01-0/+26
| | | | | | | | | | | | | | | | | | Add another nand write. variant, trimffs. This command will request of nand_write_skip_bad() that all trailing all-0xff pages will be dropped from eraseblocks when they are written to flash as-per the reccommended behaviour of the UBI FAQ [1]. The function that implements this timming is the drop_ffs() function by Artem Bityutskiy, ported from the mtd-utils tree. [1] http://www.linux-mtd.infradead.org/doc/ubi.html#L_flasher_algo Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Artem Bityutskiy <dedekind1@gmail.com> CC: Detlev Zundel <dzu@denx.de> Acked-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* nand_util: drop trailing all-0xff pages if requestedBen Gardiner2011-07-01-3/+38
| | | | | | | | | | | | | | | | | | | | Add a flag to nand_read_skip_bad() such that if true, any trailing pages in an eraseblock whose contents are entirely 0xff will be dropped. The implementation is via a new drop_ffs() function which is based on the function of the same name from the ubiformat utility by Artem Bityutskiy. This is as-per the reccomendations of the UBI FAQ [1] [1] http://www.linux-mtd.infradead.org/doc/ubi.html#L_flasher_algo Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Artem Bityutskiy <dedekind1@gmail.com> Acked-by: Detlev Zundel <dzu@denx.de> CC: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* nand_util: treat WITH_YAFFS_OOB as a modeBen Gardiner2011-07-01-1/+6
| | | | | | | | | | | | | When specified in the flags argument of nand_write, WITH_YAFFS_OOB causes an operation which is mutually exclusive with the 'usual' way of writing. Add a check that client code does not specify WITH_YAFFS_OOB along with any other flags and add a comment indicating that the WITH_YAFFS_OOB flag should not be mixed with other flags. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Scott Wood <scottwood@freescale.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
* nand_util: convert nand_write_skip_bad() to flagsBen Gardiner2011-07-01-6/+10
| | | | | | | | | | | | | | | | | | | | | | In a future commit the behaviour of nand_write_skip_bad() will be further extended. Convert the only flag currently passed to the nand_write_ skip_bad() function to a bitfield of only one allocated member. This should avoid an explosion of int's at the end of the parameter list or the ambiguous calls like nand_write_skip_bad(info, offset, len, buf, 0, 1, 1); nand_write_skip_bad(info, offset, len, buf, 0, 1, 0); Instead there will be: nand_write_skip_bad(info, offset, len, buf, WITH_YAFFS_OOB | WITH_OTHER); Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Acked-by: Detlev Zundel <dzu@denx.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
* nand_base: trivial: fix comment read/write commentBen Gardiner2011-07-01-1/+1
| | | | | | | | Replace an incorrect 'read' with 'write' in a comment. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> Acked-by: Detlev Zundel <dzu@denx.de> Signed-off-by: Scott Wood <scottwood@freescale.com>
* Merge branch 'next' of git://git.denx.de/u-boot-niosWolfgang Denk2011-07-01-17/+2
|\ | | | | | | | | * 'next' of git://git.denx.de/u-boot-nios: nios2: move generic config to boards.cfg
| * nios2: move generic config to boards.cfgMike Frysinger2011-06-30-17/+2
| | | | | | | | | | | | | | | | | | I can't build test this, but just looking at the config files written and it seems OK ... Tested-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* | cfi_flash: reverse geometry for newer STM partsMike Frysinger2011-06-29-0/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | For newer STM parts where CFI >= 1.1, there is a byte in the extended structure that declares the flash layout type (just like the AMD parts), so key off of that to find out when we need to reverse the geometry. This can be seen with M29W640 parts where U-Boot does: Bank # 1: CFI conformant FLASH (16 x 16) Size: 8 MB in 135 Sectors AMD Standard command set, Manufacturer ID: 0x20, Device ID: 0x22ED Erase timeout: 8192 ms, write timeout: 1 ms Buffer write timeout: 1 ms, buffer size: 16 bytes Sector Start Addresses: 20000000 RO 20002000 RO 20004000 RO 20006000 RO 20008000 RO 2000A000 RO 2000C000 RO 2000E000 RO 20010000 RO 20020000 RO ... But Linux does: physmap platform flash device: 00800000 at 20000000 physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank. Manufacturer ID 0x000020 Chip ID 0x0022ed physmap-flash.0: Swapping erase regions for top-boot CFI table. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Stefan Roese <sr@denx.de>
* Prepare v2011.06v2011.06Wolfgang Denk2011-06-27-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Minor coding style fixes.Wolfgang Denk2011-06-27-8/+0
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* usb: convert to partial linkingMike Frysinger2011-06-25-3/+3
| | | | | | Looks like this was missed during the conversion to partial linking. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* ehci-pci: Fix PCI EHCI driver for 36-bitZhao Chenhui2011-06-25-3/+2
| | | | | | | Convert the PCI base address into a virtual address. Signed-off-by: Zhao Chenhui <b35336@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com>
* musb: process control messages after roothub accepted itCliff Cai2011-06-25-2/+5
| | | | | | | | | | When dealing with non-multipoint devices, if the software root hub code accepted the message, then we still need to process it normally. So only return quickly when the root hub skipped the message or is otherwise in an error state. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Merge branch 'master' of git://git.denx.de/u-boot-armWolfgang Denk2011-06-23-1584/+1690
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-arm: run arm_pci_init after relocation IXP42x PCI rewrite update/fix PDNB3 board update/fix IXDP425 / IXDPG425 boards add dvlhost (dLAN 200 AV Wireless G) board IXP NPE: add support for fixed-speed MII ports update/fix AcTux4 board update/fix AcTux3 board update/fix AcTux2 board update/fix AcTux1 board use -ffunction-sections / --gc-sections on IXP42x support CONFIG_SYS_LDSCRIPT on ARM fix "depend" target in npe directory Fix IXP code to work after relocation was added trigger hardware watchdog in IXP42x serial driver add support for IXP42x Rev. B1 and newer add XScale sub architecture (IXP/PXA) to maintainer list Conflicts: arch/arm/lib/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * run arm_pci_init after relocationMichael Schwingen2011-06-23-3/+3
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * IXP42x PCI rewriteMichael Schwingen2011-06-23-549/+210
| | | | | | | | | | | | | | | | clean up IXP PCI handling: get rid of IXP-private bus scan, BAR assign etc. code and use u-boot's PCI infrastructure instead. Move board-specific PCI setup code (clock/reset) to board directory. Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * update/fix PDNB3 boardMichael Schwingen2011-06-23-5/+7
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * update/fix IXDP425 / IXDPG425 boardsMichael Schwingen2011-06-23-517/+276
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * add dvlhost (dLAN 200 AV Wireless G) boardMichael Schwingen2011-06-23-0/+607
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * IXP NPE: add support for fixed-speed MII portsMichael Schwingen2011-06-23-25/+42
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * update/fix AcTux4 boardMichael Schwingen2011-06-23-60/+86
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * update/fix AcTux3 boardMichael Schwingen2011-06-23-96/+117
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * update/fix AcTux2 boardMichael Schwingen2011-06-23-78/+100
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * update/fix AcTux1 boardMichael Schwingen2011-06-23-93/+124
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * use -ffunction-sections / --gc-sections on IXP42xMichael Schwingen2011-06-23-4/+9
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * support CONFIG_SYS_LDSCRIPT on ARMMichael Schwingen2011-06-23-0/+7
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * fix "depend" target in npe directoryMichael Schwingen2011-06-23-0/+1
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * Fix IXP code to work after relocation was addedMichael Schwingen2011-06-23-128/+68
| | | | | | | | | | | | | | - jump to real flash location after reset before turning off flash mirror - fix timer system to use HZ == 1000, remove broken interrupt-based code Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * trigger hardware watchdog in IXP42x serial driverMichael Schwingen2011-06-23-2/+5
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * add support for IXP42x Rev. B1 and newerMichael Schwingen2011-06-23-2/+5
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
| * add XScale sub architecture (IXP/PXA) to maintainer listMichael Schwingen2011-06-23-22/+22
| | | | | | | | Signed-off-by: Michael Schwingen <michael@schwingen.org>
* | tools: make it possible to build tools unconfiguredMike Frysinger2011-06-22-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Sunday, June 19, 2011 13:55:13 Ilya Yanok wrote: > On 18.06.2011 23:03, Mike Frysinger wrote: > >> - tools/Makefile put common/env_embedded.o and envcrc.o to object list > >> > >> conditionally. This fixes errors during dependency generation. > > > > pretty sure this breaks board builds. if the only thing this fixes is a > > I'm sorry but I can't see how this can break the builds. Could you > please be more specific? I've tried to build some boards, it actually > works... i might be thinking of a different env_embedded situation. a different problem with your patch to tools/Makefile: you copied the same logic multiple times which means more bitrot. why dont you do something like: > > harmless warning when generating dependency files, then i say ignore it. > > after all, this is how it has always worked in the past and no one really > > cared. > > Yep, they are harmless but they are not warnings but rather scary errors > actually. ;) I think it's better to fix them. i guess my threshold for being scared is a bit higher :p -mike
* | Makefile: move $(VERSION_FILE) rule out of ifeq configuredIlya Yanok2011-06-22-18/+18
| | | | | | | | | | | | | | | | | | mkimage relies on autogenerated version so we need to move $(VERSION_FILE) rule out of ifeq and make tools rule depend on it to be able to run 'make tools' from the unconfigured tree. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | config.mk: move LDSCRIPT processing to the top-level MakefileIlya Yanok2011-06-22-30/+30
| | | | | | | | | | | | | | | | | | | | LDSCRIPT is used only from the top-level Makefile and only when the system is configured so we can move LDSCRIPT and CONFIG_SYS_LDSCRIPT related logic into the top level Makefile and under configured condition to avoid errors when building tools from unconfigured tree. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | ARM: drop unsupported 'trab' boardWolfgang Denk2011-06-22-7892/+6
|/ | | | | | | | | | The 'trab' board configuration is broken, and there is nobody who is interested and willing to fix it. Drop it. This includes support for VFD displays which have always been used by this board only. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Prepare v2011.06-rc3v2011.06-rc3Wolfgang Denk2011-06-22-1/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* Build fix/update of AFEB9260Sergey Lapin2011-06-21-82/+97
| | | | | | | Make AFEB9260 build again. Based on fix for AT91SAM9260EK. Signed-off-by: Sergey Lapin <slapin@ossfans.org>
* macb: fix compile warningandreas.devel@googlemail.com2011-06-21-2/+3
| | | | | | | | | | | This patch fixes following compile warning: ---8<--- macb.c: In function 'macb_write_hwaddr': macb.c:525:2: warning: dereferencing type-punned pointer will break strict-aliasing rules --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@gmail.com>
* at91_emac: fix compile warningandreas.devel@googlemail.com2011-06-21-5/+7
| | | | | | | | | | | This patch removes the warning ---8<--- at91_emac.c: In function 'at91emac_write_hwaddr': at91_emac.c:487:2: warning: dereferencing type-punned pointer will break strict-aliasing rules --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@gmail.com>
* include/asm/arch-at91: update several .h files to ATMEL_xxx name schemeEric Benard2011-06-21-28/+28
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* cpuat91: fix board supportEric Benard2011-06-21-4/+3
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* cpu9260/9G20: fix board supportEric Benard2011-06-21-36/+24
| | | | Signed-off-by: Eric Bénard <eric@eukrea.com>
* arm926ejs/at91/lowlevel_init.S: fix definesEric Benard2011-06-21-19/+22
| | | | | | atmel rework changed define names which broke this file Signed-off-by: Eric Bénard <eric@eukrea.com>
* ATMEL spi_dataflash driver - fix to build againReinhard Meyer2011-06-21-2/+1
| | | | | | | | The rework effort for ATMEL (AT91/AVR32) accidentially broke build of this driver. Fix this to make it build again. However this driver should be reworked as soon as possible! Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* AT91 rework: fix TOP9000 files to build againReinhard Meyer2011-06-21-44/+50
| | | | | | | Fix EMK TOP9000 board to build again: - changes required due to ATMEL rework Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* AT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:Reinhard Meyer2011-06-21-142/+147
| | | | | | Make ATMEL's at91sam9260/9g20/9xe-ek boards build again Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
* Add support for Bluewater Systems Snapper 9260/9G20 modulesRyan Mallon2011-06-21-0/+418
| | | | | | | | Add support for Bluewater Systems AT91 based Snapper 9260 and 9G20 single board computer modules. Includes NAND flash and Ethernet support. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
* update arm/at91rm9200 work with rework rework110202Jens Scharsig2011-06-21-187/+196
| | | | | | | | | | | * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme * Fix: timer.c compile error io.h not found with arm/at91rm9200 * update arm920t/at91 to ATMEL_xxx name scheme * update arm920t/at91 soc lib * update at91_emac driver Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de> Tested-by: Andreas Bießmann <andreas.devel@gmail.com>