summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2007-09-24Merge ../u-bootMichal Simek
2007-09-20v1.3.0-rc2Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-18Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/masterWolfgang Denk
2007-09-18Avoid compiler warning.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-18Bugfix: remove embedded null (\0) from CFG_BOOTFILE macro in TQM8540_configGrant Likely
/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>
2007-09-18MCC200: fix build warningWolfgang Denk
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>
2007-09-16TQM8xx[LM]: Fix broken environment alignment.Wolfgang Denk
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>
2007-09-16TQM8xx/FPS8xx: adjust flash partitions for 2.6 ARCH=powerpc kernelsWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-15Typo fix in tsec.curwithsughosh@gmail.com
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>
2007-09-15Fix do_div() usage in nand process outputMatthias Fuchs
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>
2007-09-15NAND: Add CFG_NAND_QUIET optionMatthias Fuchs
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>
2007-09-15ColdFire: fix build error becasue of bad type of mii_init()Liew Tsi Chung-r5aahp
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-09-15ColdFire: Fix build error caused by pixis.cLiew Tsi Chung-r5aahp
Moved the #include <asm/cache.h> inside the #ifdef CONFIG_FSL_PIXIS. Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
2007-09-15Update MPC8349ITX*_config to place config.tmp in right place.Sam Sparks
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>
2007-09-15Fix cases where DECLARE_GLOBAL_DATA_PTR was not declared as globalWolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-15Make DECLARE_GLOBAL_DATA_PTR global for DaVinciDirk Behme
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
2007-09-13cm5200: Fix a typo introduced by afaac86fe2948ac84cd9a12bbed883b3c683e7d9Bartlomiej Sieka
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2007-09-12Fix memory corruption problem on STX GP3 SSA Board.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-11[GP3SSA] Add define CONFIG_MPC85XX_PCI2 in config file to allow u-boot toGrzegorz Bernacki
scan on second pci bus. Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
2007-09-11[ppc4xx] Individual handling of sdram.c for bamboo_nand buildGrzegorz Bernacki
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>
2007-09-11[FIX] Microblaze ML401 - repare FLASH handlingMichal Simek
2007-09-11Merge git://www.denx.de/git/u-bootMichal Simek
2007-09-10Merge with /home/raj/git/u-boot#ads5121_fec_optimizeWolfgang Denk
2007-09-10Allocate CPU Architecture Code for STMicroelectronics' ST200.Sean MCGOOGAN
Signed-off-by: Sean McGoogan <Sean.McGoogan@st.com> ---------------------------------------------------
2007-09-10Update version to match current state.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-10[MPC512x] Streamline frame handling in the FEC driverGrzegorz Bernacki
- 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>
2007-09-10Remove compiler warning: target CPU does not support interworkingKyungmin Park
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
2007-09-09Fix compile error in spc1920 config.Wolfgang Denk
Signed-off-by: Markus Klotzbücher <mk@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-09Bugfix: make bootm+libfdt compile on boards with no flashGrant Likely
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2007-09-08Merge with /home/raj/git/u-boot#440SPe_PCIe_fixesWolfgang Denk
2007-09-08Merge with /home/raj/git/u-boot#ads5121_fixesWolfgang Denk
2007-09-07[PPC440SPe] PCIe environment settings for Katmai and YuccaGrzegorz Bernacki
- '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>
2007-09-07[PPC440SPe] Improve PCIe configuration space accessGrzegorz Bernacki
- 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>
2007-09-07[PPC440SPe] Convert machine check exceptions handlingGrzegorz Bernacki
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>
2007-09-07Fix typo in MAKEALL script.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2007-09-07[MPC512x] Proper handling of larger frames in the FEC driverGrzegorz Bernacki
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>
2007-09-07[MPC512x] Correct fixup relocationRafal Jaworowski
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
2007-09-07Update CHANGELOG, minor coding style cleanup.Wolfgang Denk
2007-09-07PXA270: Added support for TrizepsIV board.stefano babic
This patch add support for the Trizeps IV module (520Mhz). Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07PXA270: Add support for multiple serial ports.stefano babic
This patch adds support for multiple serial ports to the PXA target. FFUART, BTUART and STUART are supported. Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07PXA270: fix compile issue (invalid lvalue)stefano babic
Code is broken for PXA270 due to "invalid lvalue in assignment". This patch fix it in pxa-regs.h Signed-off-by: Stefano Babic <sbabic@denx.de>
2007-09-07Add BUILD_DIR support for bios emulator.Jason Jin
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2007-09-07[MIPS] Remove inline asm string functionsShinya Kuribayashi
Stop using inline string functions on MIPS as other ARCHs do so, since the optimized inline asm versions are not small. This change is triggered by a following MIPS build error: common/libcommon.a(exports.o)(.text+0xdc): In function `jumptable_init': common/exports.c:32: undefined reference to `strcmp' make: *** [u-boot] Error 1 Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
2007-09-07[MIPS] Update asm string headerShinya Kuribayashi
This patches contains several bugfixes and cleanups in the latest upstream: - Don't include linux/config.h - Remove buggy inline version of memscan. - Merge with Linux 2.6.11-rc3. - Fix undefined reference to strcpy in binfmt_misc caused by gcc 3.4. - Goodbye mips64. 31704 lines of code bite the dust. - Replace extern inline with static inline. - Fix return value of strncpy. - Remove a bunch more "$1" clobbers. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
2007-09-07Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xxWolfgang Denk
2007-09-07Fix do_bootm_linux() so that multi-file images with FDT blob boot.Bartlomiej Sieka
Fix incorrect blob address calculation in do_bootm_linux() that prevents booting the kernel from a multi-file image (kernel + initrd + blob). Also, make minor updates to the U-Boot's output and to the coding style. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2007-09-07Merge with /home/wd/git/u-boot/custodian/u-boot-mpc5xxxWolfgang Denk
2007-09-06Add support for Sil680 IDE controller.Gary Jennejohn
o add drivers/sil680.c to support the Sil680 IDE-controller. o drivers/Makefile: add sil680.o. Signed-off-by: Gary Jennejohn <garyj@denx.de>
2007-09-06bootm/fdt: Only process the fdt if an fdt address was providedGrant Likely
Boards with CONFIG_OF_LIBFDT enabled are not able to boot old-style kernels using the board info structure (instead of passing a device tree) This change allows the old style booting to be used if the fdt argument was not passed to 'bootm'. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com>
2007-09-06Migrate 5xxx boards from CONFIG_OF_FLAT_TREE to CONFIG_OF_LIBFDTGrant Likely
Affects boards: icecube (lite5200), jupiter, motionpro, tqm5200 Tested on: lite5200b Note: the fixup functions have not been moved to a common place. This patch is targeted for immediate merging as in solves a build issue, but the final name/location of the fixups is still subject to debate. I propose to merge this now, and move the fixups in the next merge window to be usable by all targets. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>