summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge commit 'origin/master'Haavard Skinnemoen2007-10-02-17597/+52316
|\
| * Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-10-02-0/+2
| |\
| | * Fix missing DECLARE_GLOBAL_DATA_PTR on CONFIG_LPC2292 in serialJean-Christophe PLAGNIOL-VILLARD2007-09-28-0/+2
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | ppc4xx: Coding style cleanupStefan Roese2007-10-02-13/+13
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: lwmon5: Remove watchdog for now, since not fully tested yetStefan Roese2007-10-02-0/+5
| | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | Program EPLD to force full duplex mode for PHY.Grzegorz Bernacki2007-10-02-9/+20
| | | | | | | | | | | | | | | | | | | | | EPLD forces modes of PHY operation. By default full duplex is turned off. This fix turns it on. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| * | Merge branch 'master' of /home/stefan/git/u-boot/lwmon5Stefan Roese2007-09-27-4/+5
| |\ \
| | * | ppc4xx: Change lwmon5 default environment to support Linux RTCStefan Roese2007-08-29-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux PCF8563 RTC driver doesn't do autoprobing, so we need to supply the RTC I2C address as bootline parameter. This patch adds support for this rtc probing parameter to the bootargs: "rtc-pcf8563.probe=0,0x51" Signed-off-by: Stefan Roese <sr@denx.de>
| * | | ppc4xx: lwmon5: Change GPIO 58 to default to low (watchdog test)Stefan Roese2007-09-27-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/masterWolfgang Denk2007-09-26-1/+1
| |\ \
| | * | Fpga: fix incorrect test of CFG_FPGA_XILINX macroGrant Likely2007-09-26-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFG_FPGA_XILINX is a bit value used to test against the value in CONFIG_FPGA. Testing for a value will always return TRUE. I don't think that is the intention in this code. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | | Merge with /home/wd/git/u-boot/custodian/u-boot-usbWolfgang Denk2007-09-23-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge with git://www.denx.de/git/u-boot.gitMarkus Klotzbuecher2007-09-17-19344/+61495
| | |\ \
| | * | | Description: Add NEC's PCI OHCI module ID to the USB OHCI driverDavid Saada2007-09-17-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: David Saada <david.saada@ecitele.com>
| * | | | v1.3.0-rc2Wolfgang Denk2007-09-20-1/+367
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/masterWolfgang Denk2007-09-18-2/+2
| |\ \ \ \
| | * | | | Bugfix: remove embedded null (\0) from CFG_BOOTFILE macro in TQM8540_configGrant Likely2007-09-18-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /bin/bash and /bin/dash (which /bin/sh is linked to on ubuntu) handle embedded nulls in a string differently. For example, the following statement: echo "this is a string\0" > afile Will produce the following with /bin/bash: "this is a string\0" But with /bin/dash, will produce: "this is a string Bug fixed by moving the embedded null out of the makefile and into the config header. Also renamed the macro to avoid usage colision with the same macro used by other board ports. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | | | Avoid compiler warning.Wolfgang Denk2007-09-18-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | MCC200: fix build warningWolfgang Denk2007-09-18-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MCC200 board config file includes version.h for some customer- specific setting, which causes warnings with "make depend"; build version.h before depend. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | TQM8xx[LM]: Fix broken environment alignment.Wolfgang Denk2007-09-16-17/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With recent toolchains, the environment sectors were no longer aligned to sector boundaries. The reason was a combination of two bugs: 1) common/environment.c assumed that CONFIG_TQM8xxL would be defined for all TQM8xxL and TQM8xxM boards. But "include/common.h", where this gets defined, is not included here (and cannot be included without causing lots of problems). Added a new #define CFG_USE_PPCENV for all boards which really want to put the environment is a ".ppcenv" section. 2) The linker scripts just include environment.o, silently assuming that the objects in that file are really in the order in which they are coded in the C file, i. e. "environment" first, then "redundand_environment", and "env_size" last. However, current toolchains (GCC-4.x) reorder the objects, causing the environment data not to start on a flash sector boundary: Instead of: we got: 40008000 T environment 40008000 T env_size 4000c000 T redundand_environment 40008004 T redundand_environment 40010000 T env_size 4000c004 T environment Note: this patch fixes just the first part, and cures the alignment problem by making sure that "env_size" gets placed correctly. However, we still have a potential issue because primary and redundant environment sectors are actually swapped, i. e. we have now: 40008000 T redundand_environment 4000c000 T environment 40010000 T env_size This shall be fixed in the next version. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | TQM8xx/FPS8xx: adjust flash partitions for 2.6 ARCH=powerpc kernelsWolfgang Denk2007-09-16-50/+111
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Typo fix in tsec.curwithsughosh@gmail.com2007-09-15-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup for the break statement in wrong place. [Patch by urwithsughosh@gmail.com] Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Fix do_div() usage in nand process outputMatthias Fuchs2007-09-15-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix usage of do_div() in nand erase|read|write process output. The last patch to nand_util.c introduced do_div() instead of libgcc's implementation. But do_div() returns the quotient in its first macro parameter and not as result. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| * | | NAND: Add CFG_NAND_QUIET optionMatthias Fuchs2007-09-15-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This config option sets the default for the progress information output behavior that can also be configured through the 'quiet' environment variable. The legacy NAND code does not print the current progress info on the console. So this option is for backward compatibility for units that are in the field and where setting the quiet variable is not an option. With CFG_NAND_QUIET set to '1' the console progress info is turned off. This can still be overwritten through the environment variable. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
| * | | ColdFire: fix build error becasue of bad type of mii_init()Liew Tsi Chung-r5aahp2007-09-15-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| * | | ColdFire: Fix build error caused by pixis.cLiew Tsi Chung-r5aahp2007-09-15-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Moved the #include <asm/cache.h> inside the #ifdef CONFIG_FSL_PIXIS. Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| * | | Update MPC8349ITX*_config to place config.tmp in right place.Sam Sparks2007-09-15-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPC834ITX*_config does not store config.tmp at the correct locatation, causing MPC8349ITXGP to have the wrong TEXT_BASE. Signed-off-by: Sam Sparks <SSparks@twacs.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | | Fix cases where DECLARE_GLOBAL_DATA_PTR was not declared as globalWolfgang Denk2007-09-15-70/+51
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Make DECLARE_GLOBAL_DATA_PTR global for DaVinciDirk Behme2007-09-15-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in [1], DECLARE_GLOBAL_DATA_PTR has to be global and not function local. Signed-off-by: Dirk Behme <dirk.behme@gmail.com> [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/31805
| * | | cm5200: Fix a typo introduced by afaac86fe2948ac84cd9a12bbed883b3c683e7d9Bartlomiej Sieka2007-09-13-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| * | | Fix memory corruption problem on STX GP3 SSA Board.Wolfgang Denk2007-09-12-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | [GP3SSA] Add define CONFIG_MPC85XX_PCI2 in config file to allow u-boot toGrzegorz Bernacki2007-09-11-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | scan on second pci bus. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| * | | [ppc4xx] Individual handling of sdram.c for bamboo_nand buildGrzegorz Bernacki2007-09-11-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bamboo has a file sdram.c which needs special treatment when building in separate directory. It has to be linked to build directory otherwise it is not seen. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| * | | Merge with /home/raj/git/u-boot#ads5121_fec_optimizeWolfgang Denk2007-09-10-6/+9
| |\ \ \
| | * | | [MPC512x] Streamline frame handling in the FEC driverGrzegorz Bernacki2007-09-10-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - convert frame size settings to be derived from a single base - set frame size to the recommended default value Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| * | | | Allocate CPU Architecture Code for STMicroelectronics' ST200.Sean MCGOOGAN2007-09-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sean McGoogan <Sean.McGoogan@st.com> ---------------------------------------------------
| * | | | Update version to match current state.Wolfgang Denk2007-09-10-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Remove compiler warning: target CPU does not support interworkingKyungmin Park2007-09-10-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * | | Fix compile error in spc1920 config.Wolfgang Denk2007-09-09-8/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Markus Klotzbücher <mk@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | Bugfix: make bootm+libfdt compile on boards with no flashGrant Likely2007-09-09-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | | Merge with /home/raj/git/u-boot#440SPe_PCIe_fixesWolfgang Denk2007-09-08-104/+191
| |\ \ \
| | * | | [PPC440SPe] PCIe environment settings for Katmai and YuccaGrzegorz Bernacki2007-09-07-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 'pciconfighost' is set by default in order to be able to scan bridges behind the primary host/PCIe - 'pciscandelay' env variable is recognized to allow for user-controlled delay before the PCIe bus enumeration; some peripheral devices require a significant delay before they can be scanned (e.g. LSI8408E); without the delay they are not detected Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| | * | | [PPC440SPe] Improve PCIe configuration space accessGrzegorz Bernacki2007-09-07-62/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - correct configuration space mapping - correct bus numbering - better access to config space Prior to this patch, the 440SPe host/PCIe bridge was able to configure only the first device on the first bus. We now allow to configure up to 16 buses; also, scanning for devices behind the PCIe-PCIe bridge is supported, so peripheral devices farther in hierarchy can be identified. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| | * | | [PPC440SPe] Convert machine check exceptions handlingGrzegorz Bernacki2007-09-07-44/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert using fixup mechanism to suppressing MCK for the duration of config read/write transaction: while fixups work fine with the case of a precise exception, we identified a major drawback with this approach when there's an imprecise case. In this scenario there is the following race condition: the fixup is (by design) set to catch the instruction following the one actually causing the exception; if an interrupt (e.g. decrementer) happens between those two instructions, the ISR code is executed before the fixup handler the machine check is no longer protected by the fixup handler as it appears as within the ISR code. In consequence the fixup approach is being phased out and replaced with explicit suppressing of MCK during a PCIe config read/write cycle. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| * | | | Merge with /home/raj/git/u-boot#ads5121_fixesWolfgang Denk2007-09-08-15/+22
| |\ \ \ \
| | * | | | [MPC512x] Proper handling of larger frames in the FEC driverGrzegorz Bernacki2007-09-07-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When frame larger than local RX buffer is received, it is split and handled by two buffer descriptors. Prior to this patch the FEC driver discarded contents of a buffer descriptor without the 'LAST' bit set, so the first part of the frame was lost in case of larger frames. This fix allows to safely combine the two pieces into the whole frame. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
| | * | | | [MPC512x] Correct fixup relocationRafal Jaworowski2007-09-07-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
| * | | | | Fix typo in MAKEALL script.Wolfgang Denk2007-09-07-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | | Update CHANGELOG, minor coding style cleanup.Wolfgang Denk2007-09-07-2/+539
| | | | |
| * | | | PXA270: Added support for TrizepsIV board.stefano babic2007-09-07-2/+1217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add support for the Trizeps IV module (520Mhz). Signed-off-by: Stefano Babic <sbabic@denx.de>