summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/uboot/070912/u-boot-microblaze/Michal Simek2007-09-16-154/+119
|\
| * Synchronize with U-BOOT mainlineMichal Simek2007-09-15-154/+119
| |
| * Merge ../u-bootMichal Simek2007-09-15-12/+25
| |\
* | \ Merge ../u-bootMichal Simek2007-09-16-12/+25
|\ \ \ | |/ / |/| / | |/
| * [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>
* | [FIX] Microblaze ML401 - repare FLASH handlingMichal Simek2007-09-11-10/+16
| |
* | Merge git://www.denx.de/git/u-bootMichal Simek2007-09-11-5458/+28323
|\ \ | |/
| * 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>
| * | PXA270: Add support for multiple serial ports.stefano babic2007-09-07-84/+288
| | | | | | | | | | | | | | | | | | | | | 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>
| * | PXA270: fix compile issue (invalid lvalue)stefano babic2007-09-07-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add BUILD_DIR support for bios emulator.Jason Jin2007-09-07-8/+15
| | | | | | | | | | | | Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| * | [MIPS] Remove inline asm string functionsShinya Kuribayashi2007-09-07-114/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | [MIPS] Update asm string headerShinya Kuribayashi2007-09-07-41/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xxWolfgang Denk2007-09-07-5/+38
| |\ \ | | |/
| | * Fix ULI RTC support on MPC8544 DSKumar Gala2007-09-04-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RTC on the M1575 ULI chipset requires a dummy read before we are able to talk to the RTC. We accomplish this by adding a second memory region to the PHB the ULI is on and read from it. The second region is added to maintain compatiabilty with Linux's view of the PCI memory map. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * ft_board_setup update 85xx/86xx of pci/pcie bus-range property.Ed Swarthout2007-09-04-4/+28
| | | | | | | | | | | | | | | | | | pcie is now differentiated from pci. Add 8641 bus-range updates. Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
| * | Fix do_bootm_linux() so that multi-file images with FDT blob boot.Bartlomiej Sieka2007-09-07-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge with /home/wd/git/u-boot/custodian/u-boot-mpc5xxxWolfgang Denk2007-09-07-68/+102
| |\ \
| | * | bootm/fdt: Only process the fdt if an fdt address was providedGrant Likely2007-09-06-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Migrate 5xxx boards from CONFIG_OF_FLAT_TREE to CONFIG_OF_LIBFDTGrant Likely2007-09-06-51/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | libfdt: add convenience function fdt_find_and_setprop()Grant Likely2007-09-06-0/+28
| | |/ | | | | | | | | | | | | | | | | | | Given the path to a node, fdt_find_and_setprop() allows a property value to be set directly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * | Add support for Sil680 IDE controller.Gary Jennejohn2007-09-06-1/+111
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-09-02-733/+197
| |\ \ | | |/
| | * Fix TFTP OACK code for short packets.Wolfgang Denk2007-08-31-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code had a loop limit overflow bug which caused a semi- infinite loop for small packets, because in "i<len-8", "i" was signed, but "len" was unsigned, and "len-8" became a huge number for small values of "len". This is a workaround which replaces broken commit 8f1bc284. Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Backout commit 8f1bc284 as it causes TFTP to fail.Wolfgang Denk2007-08-30-10/+10
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Revert "Fix MPC8544DS PCIe3 scsi."Ed Swarthout2007-08-30-3/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9468e680. Commit 16e23c3f5da removing allocation of PCSRBAR is sufficient. Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
| | * tftp: don't implicity trust the format of recevied packetsGrant Likely2007-08-30-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TFTP OACK code trusts that the incoming packet is formated as ASCII text and can be processed by string functions. It also has a loop limit overflow bug where if the packet length is less than 8, it ends up looping over *all* of memory to find the 'blksize' string. This patch solves the problem by forcing the packet to be null terminated and using strstr() to search for the sub string. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| | * Merge with git+ssh://gemini/home/wd/git/u-boot/masterWolfgang Denk2007-08-29-3/+0
| | |\
| | | * sbc8641: remove unused OF_FLAT_TREE_MAX_SIZEKim Phillips2007-08-29-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this had slipped through the cracks, since the sbc board was added after I wrote the original patch to remove all these symbols, and before it was merged. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | Add mii_init() prototypeWolfgang Denk2007-08-29-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | to get rid of a *lot* of compiler warnings. Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * | Disable network support on cmi_mpc5xx boardWolfgang Denk2007-08-29-0/+2
| | |/ | | | | | | | | | | | | | | | | | | ..because it caused compiler errors and there seems to be no board maintainer to take care of this. Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * Fix MPC8544DS PCIe3 scsi.Kumar Gala2007-08-29-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <ed.swarthout@freescale.com> The problem is pciauto_setup_device() getting called from fsl_pci_init.c is allocating memory space it doesn't need. Signed-off-by: Ed Swarthout <ed.swarthout@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| | * 8548cds fixesEd Swarthout2007-08-29-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore CONFIG_EXTRA_ENV_SETTINGS definition which contains the correct consoledev needed for linux boot. Standardize on fdt{file,addr} var to hold dtb file name. Set PCI inbound memory region from CFG_MEMORY_{BUS,PHYS}. Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>