summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2008-07-13-3/+3
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2008-07-13-3/+3
| |\
| | * ppc4xx: Fix include sequence in 4xx_pcie.cStefan Roese2008-07-11-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch now moves common.h to the top of the inlcude list. This is needed for boards with CONFIG_PHYS_64BIT set (e.g. katmai), so that the phys_size_t/phys_addr_t are defined to the correct size in this driver. Signed-off-by: Stefan Roese <sr@denx.de>
* | | at91: Fix to enable using Teridian MII phy (78Q21x3) with at91sam9260Anatolij Gustschin2008-07-13-0/+9
|/ / | | | | | | | | | | | | | | | | | | | | On the at91sam9260ep development board there is an EEPROM connected to the TWI interface (PA23, PA24 Peripheral A multiplexing), so we cannot use these pins as ETX2, ETX3. This patch configures PA10, PA11 pins for ETX2, ETX3 instead of PA23, PA24 pins. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Manuel Sahm <Manuel.Sahm@feig.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-at91Wolfgang Denk2008-07-13-11/+16
|\ \
| * | MAKEALL: remove duplicated at91 from ARM9 list and add LIST_at91 to armJean-Christophe PLAGNIOL-VILLARD2008-07-10-11/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | DataFlash AT45DB021 supportSergey Lapin2008-07-10-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards based on AT91SAM926X-EK use smaller DF chips to keep bootstrap, u-boot and its environment, using NAND or other external storage for kernel and rootfs. This patch adds support for small 1024x263 chip. Signed-off-by: Sergey Lapin <slapin@ossfans.org>
* | | Fix some more printf() format issues.Wolfgang Denk2008-07-11-63/+63
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Fixed some out-of-tree build issuesWolfgang Denk2008-07-11-2/+2
| |/ |/| | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Fix some more print() format errors.Wolfgang Denk2008-07-11-63/+73
|/ | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* silence misc printf formatting compiler warningsKim Phillips2008-07-10-16/+16
| | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc512xWolfgang Denk2008-07-10-65/+389
|\
| * Configuration changes for ADS5121 Rev 3Martha Marx2008-07-10-16/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADS5121 Rev 3 board is now the default config config targets are now ads5121_config Rev 3 board with PCI M41T62 on board RTC 512MB DRAM ads5121_rev2_config Rev 2 board with No PCI 256MB DRAM Signed-off-by: Martha Marx <mmarx@silicontkx.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: John Rigby <jrigby@freescale.com>
| * Consolidate ADS5121 IO Pin configurationMartha Marx2008-07-10-49/+322
| | | | | | | | | | | | | | | | | | | | | | Consolidate ADS5121 IO Pin configuration to one file board/ads5121/iopin.c. Remove pin config from cpu/mpc512x/fec.c Signed-off-by: Martha Marx <mmarx@silicontkx.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: John Rigby <jrigby@freescale.com>
| * Fix "usb part" commandChristian Eggers2008-07-10-4/+15
| | | | | | | | | | | | | | | | Only print partition for selected device if user supplied the <dev> arg with the "usb part [dev]" command. Signed-off-by: Christian Eggers <ceggers@gmx.de> Acked-by: Markus Klotzbuecher <mk@denx.de>
| * fix USB devices with multiple configurationsHarald Welte2008-07-10-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes bugs in usbdcore*.c related to the use of devices with multiple configurations. The original code made mistakes about the meaning of configuration value and configuration index, and the resulting off-by-one errors resulted in: * SET_CONFIGURATION always selected the first configuration, no matter what wValue is being passed. * GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first configuration (index 0). Signed-off-by: Harald Welte <laforge@openmoko.org> Acked-by: Markus Klotzbuecher <mk@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xxWolfgang Denk2008-07-10-5/+40
|\ \
| * \ Merge commit 'wd/master'Jon Loeliger2008-07-10-1385/+8989
| |\ \
| * | | Feed the watchdog in u-boot for 8610 board.Jason Jin2008-07-07-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The watchdog on 8610 board is enabled by setting sw[6] to on. Once enabled, the watchdog can not be disabled by software. So feed the dog in u-boot is necessary for normal operation. Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * | | MPC8610HPCD: Report board id, board version and fpga version.Kumar Gala2008-06-19-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | MPC8641HPCN: Report board id, board version and fpga version.Kumar Gala2008-06-19-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | | USB: shutdown USB before bootingMarkus Klotzbücher2008-07-10-0/+18
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a potentially serious issue related to USB which was discouvered by Martin Krause <martin.krause@tqs.de> and fixed for ARM920T. Martin wrote: Turn off USB to prevent the host controller from writing to the SDRAM while Linux is booting. This could happen, because the HCCA (Host Controller Communication Area) lies within the SDRAM and the host controller writes continously to this area (as busmaster!), for example to increase the HccaFrameNumber variable, which happens every 1 ms. This is a slightly modified version of the patch in order to shutdown USB when booting on all architectures. Signed-off-by: Markus Klotzbuecher <mk@denx.de>
* | | Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/masterWolfgang Denk2008-07-10-19/+21
|\ \ \ | |_|/ |/| |
| * | Fix "usb part" commandChristian Eggers2008-07-10-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | Only print partition for selected device if user supplied the <dev> arg with the "usb part [dev]" command. Signed-off-by: Christian Eggers <ceggers@gmx.de> Acked-by: Markus Klotzbuecher <mk@denx.de>
| * | fix USB devices with multiple configurationsHarald Welte2008-07-10-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes bugs in usbdcore*.c related to the use of devices with multiple configurations. The original code made mistakes about the meaning of configuration value and configuration index, and the resulting off-by-one errors resulted in: * SET_CONFIGURATION always selected the first configuration, no matter what wValue is being passed. * GET_DESCRIPTOR/CONFIGURATION always returned the descriptor for the first configuration (index 0). Signed-off-by: Harald Welte <laforge@openmoko.org> Acked-by: Markus Klotzbuecher <mk@denx.de>
* | | Fix some more print() format errors.Wolfgang Denk2008-07-10-14/+14
|/ / | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk2008-07-10-91/+133
|\ \
| * | ppc4xx: Fix printf format warnings now visible with the updated format checkStefan Roese2008-07-10-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes ppc4xx related printf format warning. Those warnings are now visible since patch dc4b0b38d4aadf08826f6c31270f1eecd27964fd [Fix printf errors.] by Andrew Klossner has been applied. Thanks, this is really helpful. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Enable support for > 2GB SDRAM on AMCC KatmaiStefan Roese2008-07-10-13/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer PPC's like 440SPe, 460EX/GT can be equipped with more than 2GB of SDRAM. To support such configurations, we "only" map the first 2GB via the TLB's. We need some free virtual address space for the remaining peripherals like, SoC devices, FLASH etc. Note that ECC is currently not supported on configurations with more than 2GB SDRAM. This is because we only map the first 2GB on such systems, and therefore the ECC parity byte of the remaining area can't be written. Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Remove implementation of testdram() from Korat board supportLarry Johnson2008-07-10-39/+0
| | | | | | | | | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Update and add FDT to Korat board supportLarry Johnson2008-07-10-5/+47
| | | | | | | | | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org> Signed-off-by: Stefan Roese <sr@denx.de>
| * | Merge branch 'master' of /home/stefan/git/u-boot/u-bootStefan Roese2008-07-10-870/+2785
| |\ \
| * \ \ Merge branch 'master' of /home/stefan/git/u-boot/u-bootStefan Roese2008-07-07-619/+6191
| |\ \ \
| * | | | ppc4xx: Fix 460EX/GT PCIe port initializationStefan Roese2008-07-01-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug where the 460EX/GT PCIe UTLSET1 register was configured incorrectly. Thanks to Olga Buchonina from AMCC for pointing this out. Signed-off-by: Stefan Roese <sr@denx.de>
* | | | | MTD/NAND: Fix printf format warning in nand codeStefan Roese2008-07-10-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes NAND related printf format warning. Those warnings are now visible since patch dc4b0b38d4aadf08826f6c31270f1eecd27964fd [Fix printf errors.] by Andrew Klossner has been applied. Thanks, this is really helpful. Signed-off-by: Stefan Roese <sr@denx.de>
* | | | | rtc: Fix printf format warning in m41t60.cStefan Roese2008-07-10-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
* | | | | pci: Move PCI device configuration check into a separate weak functionStefan Roese2008-07-10-24/+46
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the check, if a device should be skipped in PCI PNP configuration into the function pci_skip_dev(). This function is defined as weak so that it can be overwritten by a platform specific one if needed. The check if the device should get printed in the PCI summary upon bootup (when CONFIG_PCI_SCAN_SHOW is defined) is moved to the function pci_print_dev() which is also defined as weak too. Signed-off-by: Stefan Roese <sr@denx.de>
* | | | Minor coding style cleanup; update CHANGELOGWolfgang Denk2008-07-10-2/+698
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flashWolfgang Denk2008-07-10-95/+140
|\ \ \ \
| * | | | NAND: ifdef-protect most of nand.h when using legacy NAND.Scott Wood2008-07-09-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some macros such as NAND_CTL_SETALE conflict between current and legacy NAND, being defined by the subsystem in the former case and the board config file in the latter. Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | | | NAND: Fix warning due to missing env_ptr casts to u_char * in env_nand.c.Marcel Ziswiler2008-07-09-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The writeenv() and readenv() calls introduced by the recently added bad block management for environment variables were missing casts therefore producing compile time warnings. While at it fixing some typo in a comment and indentation. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
| * | | | NAND: Rename DEBUG to MTDDEBUG to avoid namespace pollution.Scott Wood2008-07-09-90/+132
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is particularly problematic now that non-NAND-specific code is including <nand.h>, and thus all debugging code is being compiled regardless of whether it was requested, as reported by Scott McNutt <smcnutt@psyent.com>. Signed-off-by: Scott Wood <scottwood@freescale.com>
* | | | e1000: add support for 82545GM 64bit PCI-X copper variantPaul Gortmaker2008-07-10-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This PCI-X e1000 variant works by just adding in the correct PCI IDs in the appropriate places. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
* | | | SPARC: Build error fixDaniel Hellstrom2008-07-10-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (introduced by commit 391fd93ab23e15ab3dd58a54f5b609024009c378) This patch makes SPARC targets build again. It is caused by phys_addr_t and phys_size_t being defined in the wrong header file. include/lmb.h need those typedefs to build. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
* | | | Many spelling fixes in README.Marcel Ziswiler2008-07-10-70/+71
| | | | | | | | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
* | | | Minor spelling fix in comment.Marcel Ziswiler2008-07-10-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
* | | | Round the serial port clock divisor value returned by calc_divisor()Hugo Villeneuve2008-07-10-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Round the serial port clock divisor value returned by calc_divisor(). Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Signed-off-by: John Roberts <john.roberts@pwav.com>
* | | | ARM: Fix for wrong patch version applied for Lyrtech SFF-SDR board (ARM926EJS)Hugo Villeneuve2008-07-10-267/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARM: Fix for incorrect version of patch applied when adding support for the Lyrtech SFF-SDR board. Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Signed-off-by: Philip Balister, OpenSDR <philip@opensdr.com>
* | | | Remove useless print message at apollonKyungmin Park2008-07-10-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Remove useless print message at apollon Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
* | | | Fix LMB type issuesAndy Fleming2008-07-10-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The LMB code now uses phys_addr_t and phys_size_t. Also, there were a couple of casting problems in the bootm code that called the LMB functions. Signed-off-by: Andy Fleming <afleming@freescale.com>