summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 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>
* | | Fix compiler warningsKumar Gala2008-07-10-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc-4.3.x generates the following: bootm.c: In function 'do_bootm_linux': bootm.c:208: warning: cast from pointer to integer of different size bootm.c:215: warning: cast from pointer to integer of different size Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | Remove code duplication for setting the default environmentHarald Welte2008-07-10-29/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | common/env_common.c (default_env): new function that resets the environment to the default value common/env_common.c (env_relocate): use default_env instead of own copy common/env_nand.c (env_relocate_spec): use default_env instead of own copy include/environment.h: added default_env prototype Signed-off-by: Werner Almesberger <werner@openmoko.org> Signed-off-by: Harald Welte <laforge@openmoko.org>
* | | mmc: Move atmel_mci driver into drivers/mmcHaavard Skinnemoen2008-07-10-1/+2
| | | | | | | | | | | | | | | | | | | | | This makes it easier to use the driver on other platforms. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | avr32: Use CONFIG_ATMEL_MCI to select the atmel_mci driverHaavard Skinnemoen2008-07-10-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | After we move the atmel_mci driver into drivers/mmc, we can't select it with CONFIG_MMC anymore. Introduce a new symbol specifically for this driver so that there's no ambiguity. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | Create drivers/mmc subdirectoryHaavard Skinnemoen2008-07-10-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | In order to consolidate more of the various MMC drivers around the tree, we must first have a common place to put them. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Acked-by: Jean-Chritophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | | Change env_get_char from a global function ptr to a functionJoakim Tjernlund2008-07-09-8/+15
| | | | | | | | | | | | | | | | | | This avoids an early global data reference. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* | | Some copy-n-paste fixes in printf usageMatvejchikov Ilya2008-07-09-9/+9
| | | | | | | | | | | | Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
* | | FDT memory and pci node fixes for MPC8260ADSMatvejchikov Ilya2008-07-09-0/+46
| | | | | | | | | | | | Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
* | | Fix printf errors.Andrew Klossner2008-07-09-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler will help find mismatches between printf formats and arguments if you let it. This patch adds the necessary attributes to declarations in include/common.h, then begins to correct the resulting compiler warnings. Some of these were bugs, e.g., "$d" instead of "%d" and incorrect arguments. Others were just annoying, like int-long mismatches on a system where both are 32 bits. It's worth fixing the annoying errors to catch the real ones. Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-mipsWolfgang Denk2008-07-09-0/+11
|\ \ \
| * | | mips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environmentJason McMullan2008-07-08-0/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | Add 'ethaddr' and 'eth1addr' to the Linux kernel environment if they are set in the U-Boot environment. Signed-off-by: Jason McMullan <mcmullan@netapp.com> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashWolfgang Denk2008-07-09-1/+1
|\ \ \
| * | | jedec_flash: Fix AM29DL800BB device IDStefan Roese2008-07-08-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | As pointed out by Jerry Hicks, this patch corrects the device ID of the Spansion AM29DL800BB NOR device. Verified against latest Spansion datasheet (rev C4 from Dezember 2006). Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-netWolfgang Denk2008-07-09-221/+1224
|\ \ \
| * | | Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c.Hugo Villeneuve2008-07-06-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate code in cpu/arm926ejs/davinci/lxt972.c. Remove duplicate code in a if/else block in cpu/arm926ejs/davinci/lxt972.c. Fixed style issues. Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | Remove duplicate definitions in include/lxt971a.h.Hugo Villeneuve2008-07-06-168/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate definitions in include/lxt971a.h. Remove duplicate registers and bits definitions in include/lxt971a.h for standard MII registers, and use values in include/miiphy.h instead. Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | net: sh: Renesas SH7763 Ethernet device supportNobuhiro Iwamatsu2008-07-06-0/+1050
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renesas SH7763 has 2 channel Ethernet device. This is 10/100/1000 Base support. But this patch check 10/100 Base only. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | net: ne2000: Move dev_addr variable from grobal to local.Nobuhiro Iwamatsu2008-07-06-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | net: ne2000: Fix compile error of NE2000Nobuhiro Iwamatsu2008-07-06-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If enable DEBUG, can not compile ne2000 driver. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | | Add mechanisms for CPU and board-specific Ethernet initializationBen Warren2008-07-06-17/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is the first step in cleaning up net/eth.c, by moving Ethernet initialization to CPU or board-specific code. Initial implementation is only on the Freescale TSEC controller, but others will be added soon. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* | | | Merge branch 'master' of git://www.denx.de/git/u-boot-shWolfgang Denk2008-07-09-121/+86
|\ \ \ \
| * | | | sh: Fix compile error sh7763rdp boardNobuhiro Iwamatsu2008-07-08-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable SH ether driver. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>