summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Revert merge of git://www.denx.de/git/u-boot-arm, commit 62479b18:Wolfgang Denk2008-04-11-4013/+199
| | | | | | | | | | | | | | | | | | | | | | Reverting became necessary after it turned out that the patches in the u-boot-arm repo were modified, and in some cases corrupted. This reverts the following commits: 066bebd6353e33af3adefc3404560871699e9961 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6 c88ae20580b2b01487b4cdcc8b2a113f551aee36 a147e56f03871bba4f05058d5e04ce7deb010b04 d6674e0e2a6a1f033945f78838566210d3f28c95 8c8463cce44d849e37744749b32d38e1dfb12e50 c98b47ad24b2d91f41c09a3d62d7f70ad84f4b7d 8bf69d81782619187933a605f1a95ee1d069478d 8c16cb0d3b971f46fbe77c072664c0f2dcd4471d a574a73852a527779234e73e17e7597fd8128882 1377b5583a48021d983e1fd565f7d40c89e84d63 1704dc20917b4f71e373e2c888497ee666d40380 Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://www.denx.de/git/u-boot-fdtWolfgang Denk2008-04-08-218/+90
|\
| * MPC8xx: Fix libfdt support introduced in commit 77ff7b74Jean-Christophe PLAGNIOL-VILLARD2008-04-02-10/+23
| | | | | | | | | | | | | | | | | | | | fdt.c: In function 'ft_cpu_setup': fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory' Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * Fix fdt set command to conform to dts specAndy Fleming2008-04-02-70/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fdt set command was treating properties specified as <00> and <0011> as byte streams, rather than as an array of cells. As we already have syntax for expressing the desire for a stream of bytes ([ xx xx ...]), we should use the <> syntax to describe arrays of cells, which are always 32-bits per element. If we imagine this likely (IMHO) scenario: > fdt set /ethernet-phy@1 reg <1> With the old code, this would create a bad fdt, since the reg cell would be made to be one byte in length. But the cell must be 4 bytes, so this would break mysteriously. Also, the dts spec calls for constants inside the angle brackets (<>) to conform to C constant standards as they pertain to base. Take this scenario: > fdt set /ethernet@f00 reg <0xe250000\ 0x1000> The old fdt command would complain that it couldn't parse that. Or, if you wanted to specify that a certain clock ran at 33 MHz, you'd be required to do this: > fdt set /mydev clock <1f78a40> Whereas the new code will accept decimal numbers. While I was in there, I extended the fdt command parser to handle property strings which are split across multiple arguments: > fdt set /ethernet@f00 interrupts < 33 2 34 2 36 2 > > fdt p /ethernet@f00 ethernet@f00 { interrupts = <0x21 0x2 0x22 0x2 0x24 0x2>; }; Lastly, the fdt print code was rearranged slightly to print arrays of cells if the length of the property is a multiple of 4 bytes, and to not print leading zeros. Signed-off-by: Andy Fleming <afleming@freescale.com>
| * remove remaining CONFIG_OF_HAS_{UBOOT_ENV,BD_T} codeKim Phillips2008-04-01-138/+0
| | | | | | | | | | | | | | | | finish off what commit 43ddd9c820fec44816188f53346b464e20b3142d, "Remove deprecated CONFIG_OF_HAS_UBOOT_ENV and CONFIG_OF_HAS_BD_T" started. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * Merge git://www.denx.de/git/u-boot into ubootGerald Van Baren2008-03-29-5621/+17378
| |\
| * \ Merge git://www.denx.de/git/u-boot into ubootGerald Van Baren2008-03-21-63/+1170
| |\ \
* | \ \ Merge branch 'master' of git://www.denx.de/git/u-boot-at91Wolfgang Denk2008-04-08-999/+2496
|\ \ \ \
| * | | | dataflash: Move CONFIG_HAS_DATAFLASH to MakefileJean-Christophe PLAGNIOL-VILLARD2008-04-01-7/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | Add maintainership information for AT91CAP9ADK and AT91SAM9260EK boardsStelian Pop2008-04-01-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | AT91SAM9260EK: Move CONFIG_CMD_NAND to MakefileJean-Christophe PLAGNIOL-VILLARD2008-04-01-6/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | Add support for AT91SAM9260EKStelian Pop2008-04-01-7/+891
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for booting from internal DataFlash, external DataFlash card or NAND flash is available. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | AT91SAM9: Move CONFIG_HAS_DATAFLASH to MakefileJean-Christophe PLAGNIOL-VILLARD2008-04-01-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | AT91CAP9ADK: Move CONFIG_CMD_NAND to MakefileJean-Christophe PLAGNIOL-VILLARD2008-04-01-6/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | Port AT91CAP9 to the new headersStelian Pop2008-04-01-247/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt the existing AT91CAP9 code to the new headers and APIs. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | Finish header files reworkingStelian Pop2008-04-01-537/+465
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace AT91CAP9.h file with several splitted header files coming from the Linux kernel. This is part 2 of the replacement: more header imports and edits. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | Import several header files from LinuxStelian Pop2008-04-01-0/+695
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace AT91CAP9.h file with several splitted header files coming from the Linux kernel. This is part 1 of the replacement: pristine header files import. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | Move at91cap9 specific files to at91sam9 directoryStelian Pop2008-04-01-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91CAP9 and AT91SAM9 SoCs are very close hardware wise, so a common infrastructure can be used. Let this infrastructure be named after the AT91SAM9 family, and move the existing AT91CAP9 files to the new place. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | Use timer_init() instead of board supplied interrupt_init()Stelian Pop2008-04-01-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer on AT91CAP9/AT91SAM9 is supplied by the SoC, and not by the board, so use timer_init() instead of interrupt_init(). Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | Cleanup DataFlash partition handlingStelian Pop2008-04-01-62/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DataFlash partition information has become a mess. This patch defines a single partition scheme for Atmel DataFlashes. This partition scheme will be used by all AT91CAP9 and AT91SAM9 boards. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | Fix CFG_NO_FLASH compilation.Stelian Pop2008-03-30-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many Atmel boards have no "real" (NOR) flash on board, and rely only on DataFlash and NAND memories. This patch enables CFG_NO_FLASH to be present in a board configuration file, while still enabling flash commands like 'flinfo', 'protect', etc. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | | | use correct at91rm9200 register name in m501sk boardJean-Christophe PLAGNIOL-VILLARD2008-03-30-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a naming bug for at91rm9200 lowlevel init code: NOR boot flash is on chipselect 0, not chipselect 2. This makes code use the register name from chip datasheets. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | | use correct at91rm9200 register nameDavid Brownell2008-03-30-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a naming bug for at91rm9200 lowlevel init code: NOR boot flash is on chipselect 0, not chipselect 2. This makes code use the register name from chip datasheets. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
| * | | | add missing ARM boards to MAKEALLDavid Brownell2008-03-30-0/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Add some missing ARM boards to MAKEALL. These build correctly, unlike several of the boards already listed. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-netWolfgang Denk2008-04-08-17/+993
|\ \ \ \
| * | | | Add Vitesse 8601 support to TSEC driverTor Krill2008-03-31-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add phy_info for Vitesse VSC8601. Add config option, CFG_VSC8601_SKEWFIX, to enable RGMII skew timing compensation. Signed-off-by: Tor Krill <tor@excito.com> Reviewed-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | SPARC: added SMC91111 driver in and out macros for LEON processors.Daniel Hellstrom2008-03-31-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes SPARC/LEON processors able to read and write to the SMC91111 chip using the chip external I/O bus of the memory controller. This patchs defines the standard in and out macros expected by the SMC9111 driver. To access that I/O bus one must set up the memory controller (MCTRL or FTMCTRL) correctly. It is assumed that the user sets up this correctly when the other MCTRL parameters are set up. It can be set up from the board configuration header file. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | Fix macro typo in common/cmd_mii.cBen Warren2008-03-30-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This typo was introduced in commit 233a8bcd94997f3f345833a3b82e836222f2a206. I actually applied the wrong patch. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | new PHY @ e1000 - 2nd tryAndre Schwarz2008-03-30-13/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 82541ER device with latest integrated IGP2 PHY. Introduced CONFIG_E1000_FALLBACK_MAC for NIC bring-up with empty eeprom. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | SPARC/LEON3: Added GRETH Ethernet 10/100/1000 driver.Daniel Hellstrom2008-03-30-0/+763
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GRETH is an Ethernet 10/100 or 10/100/1000 MAC with out without a debug link (EDCL). The GRETH core is documented in GRIP.pdf available at www.gaisler.com. If the GRETH has GigaBit support (GBIT, Scatter gather, checksum offloading etc.) can be determined by a bit in the control register. The GBIT MAC is supported by operating in GRTEH 10/100 legacy mode. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | Add CONFIG_MII_INIT in cmd_mii.cTsi-Chung Liew2008-03-30-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide common configuration in do_mii() to execute mii_init() for all cpu architectures Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | ColdFire: Fix FEC transmit issue for MCF5275Tsi-Chung Liew2008-03-30-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | | DHCP request fix for Windows Server 2003Aras Vaichas2008-03-30-1/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option CONFIG_BOOTP_DHCP_REQUEST_DELAY. This provides an optional delay before sending "DHCP Request" in net/bootp.c. Required to overcome interoperability problems with Windows Server 200x DHCP server when U-Boot client responds too fast for server to handle. Signed-off-by: Aras Vaichas <arasv@magtech.com.au> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2008-04-08-343/+1711
|\ \ \ \
| * | | | ColdFire: Fix alignment issue after CONFIG_IDENT_STRING in start.STsiChung Liew2008-03-31-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the version_string function in start.S is not 4-byte align, it will cause the compiler generates "unaligned opcodes detected in executable segment". This issue affects all ColdFire CPUs. By adding .align 4 after CONFIG_IDENT_STRING, it will pad 0's if it is not aligned. Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Add dspi and serial flash support for MCF5445xTsiChung Liew2008-03-31-70/+492
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Remove R5200 boardTsiChung Liew2008-03-31-885/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This board never went into production Signed-off-by: Zachary P. Landau <zachary.landau@labxtechnologies.com> Acked-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Added M5275EVB support.Matthew Fettke2008-03-31-0/+864
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Fettke <mfettke@videon-central.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Added MCF5275 cpu support.Matthew Fettke2008-03-31-3/+959
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Fettke <mfettke@videon-central.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Define bootdelay in configuration file for M52277EVBTsiChung Liew2008-03-31-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matt Wadel <Matt.Waddel@freescale.com> Acked-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Fix second memory Chipselect for M5475EVBTsiChung Liew2008-03-31-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
| * | | | ColdFire: Update correct FLASHBAR and RAMBAR1 for MCF5282TsiChung Liew2008-03-31-2/+2
| |/ / / | | | | | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com> Acked-by: John Rigby <jrigby@freescale.com>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-blackfinWolfgang Denk2008-04-08-11048/+3899
|\ \ \ \
| * | | | Blackfin: cleanup and overhaul common board init functionsMike Frysinger2008-03-30-236/+226
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | Blackfin: cleanup lib_blackfin/cache.cMike Frysinger2008-03-30-62/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | Blackfin: unify cpu and boot modesMike Frysinger2008-03-30-9760/+2848
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the duplicated code for Blackfin processors and boot modes have been unified. After all, the core is the same for all processors, just the peripheral set differs (which gets handled in the drivers). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | Blackfin: BF537-stamp: cleanup spi flash driverMike Frysinger2008-03-30-992/+819
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This punts the old spi flash driver for a new/generalized one until the common one can be integrated. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-armWolfgang Denk2008-04-08-199/+4013
|\ \ \ \
| * | | | Bracket READ_TIMER macro in cpu/arm1136/omap24xx/interrupts.cPeter Pearse2008-03-30-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prevent compilation error. Signed-off-by: Peter Pearse <peter.pearse@arm.com>
| * | | | Support for the MX31ADS evaluation board from FreescaleGuennadi Liakhovetski2008-03-30-0/+683
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the MX31ADS evaluation board from Freescale, initialization code is copied from RedBoot sources, also provided by Freescale. Signed-off-by: Guennadi Liakhovetski <lg@denx.de>