summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'origin' into kconfig-for-1.3.1Grant Likely2007-11-20-7/+5
|\
| * Move CONFIG_QE out of CONFIG_PCI wrap for MPC8568MDSHaiying Wang2007-11-19-5/+5
| | | | | | | | | | | | CONFIG_QE shouldn't be in the wrap of CONFIG_PCI, fix it. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
| * Fix build problems with mp2usb boardWolfgang Denk2007-11-19-2/+0
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'origin' into kconfig-for-1.3.1Grant Likely2007-11-16-70/+118
|\ \ | |/ | | | | | | | | Conflicts: drivers/Makefile
| * Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2007-11-17-15/+33
| |\
| | * ColdFire: MCF5329 - Remove reset registers from CCMTsiChungLiew2007-11-08-12/+9
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5329 - Add Reset structure to immap_5329.hTsiChungLiew2007-11-08-0/+5
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5329 - revert include/asm-m68k/m5329.h file modeTsiChungLiew2007-11-08-0/+0
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF5445x - Update correct RAMBAR and missing linker filesTsiChungLiew2007-11-07-2/+2
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * ColdFire: MCF532x - Update do_reset() using core resetTsiChungLiew2007-11-07-1/+17
| | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| * | Fix the i2c frequency and default address in rsdproto boardLuotao Fu2007-11-17-2/+2
| | | | | | | | | | | | | | | | | | | | | rsdproto board support has wrong I2C frequency and wrong return value handling. Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
| * | powerpc: Backout relocation changes.Grant Likely2007-11-17-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ugh. I *hate* to back this change out, but these compiler flags don't work for relocation on all versions of GCC. I've not been able to reproduce the environment in my setup (and hence, not been able to find a combination that *does* work), so I've got no choice but to go back to the old gcc flags and linker script. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | Fixed mips_io_port_base build errors.Jean-Christophe PLAGNIOL-VILLARD2007-11-17-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has been sent on: - 29 Sep 2007 Although mips_io_port_base is currently a part of IDE command, it is quite fundamental for MIPS I/O port access such as in[bwl] and out[bwl]. So move it to MIPS general part, and introduce `set_io_port_base()' from Linux. This patch is triggered by multiple definition of `mips_io_port_base' build error on gth2 (and tb0229 also needs this fix.) board/gth2/libgth2.a(gth2.o): In function `log_serial_char': /home/skuribay/devel/u-boot.git/board/gth2/gth2.c:47: multiple definition of `mips_io_port_base' common/libcommon.a(cmd_ide.o):/home/skuribay/devel/u-boot.git/common/cmd_ide.c:712: first defined here make: *** [u-boot] Error 1 Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2007-11-17-2/+2
| |\ \
| | * \ Merge branch 'master' of git://www.denx.de/git/u-bootStefan Roese2007-11-13-268/+221
| | |\ \ | | | |/
| | * | Merge git://www.denx.de/git/u-bootStefan Roese2007-10-27-86/+95
| | |\ \
| | * | | ppc4xx: lwmon5: Some further GPIO config changesStefan Roese2007-10-23-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | | | Unify pixis_reset altbank across board familiesJason Jin2007-11-17-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, refactor the CFG_PIXIS_VBOOT_MASK values into the separate board config files. Signed-off-by: Jason Jin <Jason.jin@freescale.com> Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | | | Merge branch 'master' of git://www.denx.de/git/u-boot-netWolfgang Denk2007-11-16-50/+64
| |\ \ \ \
| | * | | | NET: Add Ethernet 1000BASE-X support for PPC4xxLarry Johnson2007-11-06-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for 1000BASE-X to functions "miiphy_speed ()" and "miiphy_duplex()". It also adds function "miiphy_is_1000base_x ()", which returns non-zero iff the PHY registers are configured for 1000BASE-X. The "mii info" command is modified to distinguish between 1000BASE-T and -X. Signed-off-by: Larry Johnson <lrj@acm.org> Signed-off-by: Ben Warren <bwarren@qstreams.com>
| | * | | | NET: Cosmetic changesLarry Johnson2007-11-06-50/+42
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org> Signed-off-by: Ben Warren <bwarren@qstreams.com>
* | | | | Add .gitignore filesGrant Likely2007-11-15-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* | | | | Revert "Correct relocation fixup for mpc5xx"Grant Likely2007-11-15-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3649cd99ba815b6601868735765602f00ef3692b. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | Revert "Correct fixup relocation for MPC5xxx"Grant Likely2007-11-15-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6f7576b20ecf0d040c3ac3b032b5cbc860e38a90. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | Revert "Correct fixup relocation for mpc8220"Grant Likely2007-11-15-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a85dd254c0577fca13627c46e93fc2ad4c4f1f00. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | Revert "Correct fixup relocation for mpc824x"Grant Likely2007-11-15-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f3a52fe05923935db86985daf9438e2f70ac39aa. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | Revert "Correct fixup relocation for mpc8260"Grant Likely2007-11-15-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5af61b2f4b838a05f79be274f3e5a66edd2d9c96. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | Revert "Correct fixup relocation for mpc83xx"Grant Likely2007-11-15-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 057004f4a4863554d56cc56268bfa7c7d9738e27. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | | Revert "[MPC512x] Correct fixup relocation"Grant Likely2007-11-15-1/+0
|/ / / / | | | | | | | | | | | | | | | | This reverts commit 8d17979d0359492a822a0a409d26e3a3549b4cd4. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* | | | [UC101] SRAM now with 2 MB working.Heiko Schocher2007-11-13-1/+1
|/ / / | | | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* | | Cleanup coding style; update CHANGELOGWolfgang Denk2007-11-03-1/+1
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Fix USB support issue for MPC8641HPCN board.Zhang Wei2007-11-03-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration file has already enabled USB, but it missed definition of CFG_OHCI_SWAP_REG_ACCESS, the USB on MPC8641HPCN can not work because of the wrong USB register endian. And add the USB command to U-Boot commands list. Signed-off-by: Zhang Wei <wei.zhang@freescale.com>
* | | Use config_cmd_default.h instead of config_cmd_all.hJean-Christophe PLAGNIOL-VILLARD2007-11-03-229/+160
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | changes for IDS8247 board supportSergej Stepanov2007-11-03-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get the IDS8247 board working following are done: - FCC2 is deactivated - FCC1 is activated - I2C is activated - CFI driver is activated - Adapted for use with LIBFDT Signed-off-by: Sergej Stepanov <Sergej.Stepanov@ids.de> --
* | | Merge branch 'master' of /home/wd/git/u-boot/workWolfgang Denk2007-11-02-29/+31
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2007-11-02-27/+26
| |\ \
| | * | ATSTK1002: Remove default ethernet addressesHaavard Skinnemoen2007-11-01-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wolfgang is right: It's not a good idea to set up default initial ethernet addresses for a board, even though they belong to the local range. This will change the failure mode from "IT manager screams at you for using duplicate ethernet addresses" to a nice error message explaining that the ethernet address hasn't been set properly. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
| | * | Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2007-11-01-19/+23
| | |\ \
| | | * | ColdFire 54455: Fix correct boot location for atmel and intelTsiChungLiew2007-10-25-16/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire 5329: Assign correct SDRAM size and fix cacheTsiChungLiew2007-10-25-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire 5253: Assign correct SDRAM sizeTsiChungLiew2007-10-25-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | | * | ColdFire 5282: Fix external flash boot and return dramsizeTsiChungLiew2007-10-25-1/+1
| | | |/ | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| | * | Merge branch 'master' of git://www.denx.de/git/u-boot-tq-groupWolfgang Denk2007-11-01-1/+1
| | |\ \
| | | * | TQM5200: fix spurious characters on second serial interfaceMartin Krause2007-10-24-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch PSC3 is configured as UART. This is done, because if the pins of PSC3 are not configured at all (-> all pins are GPI), due to crosstalk, spurious characters may be send over the RX232_2_TXD signal line. Signed-off-by: Martin Krause <martin.krause@tqs.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| | | * | Merge branch 'u-boot' of /home/mkr/git/u-boot-tq-group into bugfixMartin Krause2007-10-23-0/+4
| | | |\ \ | | | | |/
| * | | | Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2007-11-01-2/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2007-11-01-1/+1
| | |\ \ \
| | | * | | [MIPS] Fix UNCACHED_SDRAMVlad Lungu2007-10-21-1/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | PHYSADDR is for physical address, KSEG1ADDR is for uncached. Signed-off-by: Vlad Lungu <vlad@comsys.ro> Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
| | * | | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xxWolfgang Denk2007-11-01-1/+4
| | |\ \ \
| | | * | | Improve handling of PCI interrupt device tree fixup on MPC85xx CDSKumar Gala2007-10-19-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the MPC85xx CDS we have two issues: 1. The device tree fixup code did not check to see if the property we are trying to update is actually found. Its possible that it would update random memory starting at 0. 2. Newer Linux kernel's have moved the location of the PCI nodes to be sibilings of the soc node and not children. The explicit PATH to the PCI node would not be found for these device trees. Add the ability to handle both paths. In the future we shouldn't handle such fixups by explicit path. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>