summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2010-03-30-22/+118
|\
| * mpc86xx: set the DDR BATs after calculating true DDR sizeTimur Tabi2010-03-30-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After determining how much DDR is actually in the system, set DBAT0 and IBAT0 accordingly. This ensures that the CPU won't attempt to access (via speculation) addresses outside of actual memory. On 86xx systems, DBAT0 and IBAT0 (the BATs for DDR) are initialized to 2GB and kept that way. If the system has less than 2GB of memory (typical for an MPC8610 HPCD), the CPU may attempt to access this memory during speculation. The zlib code is notorious for generating such memory reads, and indeed on the MPC8610, uncompressing the Linux kernel causes a machine check (without this patch). Currently we are limited to power of two sized DDR since we only use a single bat. If a non-power of two size is used that is less than CONFIG_MAX_MEM_MAPPED u-boot will crash. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * 85xx: Fix enabling of L1 cache parity on secondary coresKumar Gala2010-03-30-13/+65
| | | | | | | | | | | | | | | | | | | | | | Use the same code between primary and secondary cores to init the L1 cache. We were not enabling cache parity on the secondary cores. Also, reworked the L1 cache init code to match the e500mc L2 init code that first invalidates the cache and locks. Than enables the cache and makes sure its enabled before continuing. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2010-03-30-1/+4
|\ \
| * | ppc4xx: Fix problem with I2C bus >= 1 initializationStefan Roese2010-03-30-1/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem introduced with patch eb5eb2b0 [ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C base address to the "i2c" pointer inside of the controller loop. Otherwise controller 0 is initialized multiple times instead of initializing each I2C controller sequentially. Tested on Katmai. Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Heiko Schocher <hs@denx.de>
* | bootm, linux: fix booting Multi-File Image with "kernel+ramdisk+fdt"Heiko Schocher2010-03-29-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Booting a "Multi-File Image" including a linux kernel, ramdisk and fdt, generated with mkimage -A ppc \ -O linux \ -T multi \ -C gzip \ -a 00000000 \ -e 00000000 \ -n "kernel-2.6+initrd+dtb" \ -d "vmlinux.bin.gz:ramdisk_image.gz:board.dtb" \ multi.bin actually fails, because ramdisk start and end addresses didn;t get initialized. This patch fixes this issue. Tested on the KUP4K board. Signed-off-by: Heiko Schocher <hs@denx.de>
* | Prepare 2010.03-rc3v2010.03-rc3Wolfgang Denk2010-03-28-1/+101
|/ | | | | | Update CHANGELOG Signed-off-by: Wolfgang Denk <wd@denx.de>
* cmd_usb.c: print debug messages only when DEBUG is definedWolfgang Denk2010-03-28-2/+2
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* ml300: remove support for broken, orphaned boardWolfgang Denk2010-03-28-1747/+0
| | | | | | | | The ml300 board has a number of issues, but nobody cares about this long-orphaned board any more. Remove it. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Michal Simek <monstr@monstr.eu>
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2010-03-28-6/+70
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2010-03-28-1/+4
| |\
| | * cfi_flash: precision and underflow problem in tout calculationRenato Andreola2010-03-25-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | With old configuration it could happen tout=0 if CONFIG_SYS_HZ<1000. Signed-off-by: Renato Andreola <renato.andreola@imagos.it> Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx fix unstable 440EPx bootstrap optionsRupjyoti Sarmah2010-03-24-5/+66
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 440EPx fixed bootstrap options A, B, D, and E sets PLL FWDVA to a value = 1. This results in the PLLOUTB being greater than the CPU clock frequency resulting unstable 440EPx operation resulting in various software hang conditions. This patch reprograms the FWDVA satisfying the requirement of setting FWDVB to a value greater than 1 while using one of the four deafult bootstrap options. Signed-off-by: Rupjyoti Sarmah <rsarmah@amcc.com> Acked-by : Victor Gallardo <vgallardo@appliedmicro.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | mkimage: fix Segmentation Fault when run without "-n name" optionWolfgang Denk2010-03-28-0/+1
|/ | | | | | | | | The restructuring of the mkimage command in commit 89a4d6b1 ("tools: mkimage: split code into core, default and FIT image specific") introduced a bug that caused mkimage to segfault when run without "-n name" option. Initialize the imagename entry to prevent that. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2010-03-24-4/+20
|\
| * lcd: make 16bpp workAlessandro Rubini2010-03-24-4/+20
| | | | | | | | | | | | | | | | | | Support for 16bpp was supposed to be in the code but was not working. This makes it work and has been tested in the nhk8815 board. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | at91: Get rid of some warnings when building for otc570Matthias Fuchs2010-03-24-0/+1
|/ | | | | | | | | The soft-i2c code for AT91 defines I2C_SOFT_DECLARATIONS for direct access by dereferencing a pio pointer. The OTC570 platform uses the AT91 gpio API so it does not need the pio variable. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
* Prepare v2010.03-rc2v2010.03-rc2Wolfgang Denk2010-03-22-1/+206
| | | | | | Update CHANGELOG Signed-off-by: Wolfgang Denk <wd@denx.de>
* ep93xx timer: Fix resolution of get_ticks()Matthias Kaehlcke2010-03-22-6/+9
| | | | | | | ep93xx timer: Make get_ticks() return a value in CONFIG_SYS_HZ resolution, as announced by get_tbclk() Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
* ep93xx timer: Fix possible overflow in usecs_to_ticks()Matthias Kaehlcke2010-03-22-12/+4
| | | | | | | ep93xx timer: Use 64-bit values in usecs_to_ticks() in order to avoid overflows in intermediate values Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
* correct a syntax typo in at91_matrix.hAsen Dimov2010-03-21-1/+1
| | | | Signed-off-by: Asen Dimov <dimov@ronetix.at>
* env: fix endian ordering in crc tableJeff Angielski2010-03-21-1/+1
| | | | | | | | | The crc table was being built as little endian for big endian targets. This would cause fw_printenv to always fail with "Warning: Bad CRC, using default environment" messages. Signed-off-by: Jeff Angielski <jeff@theptrgroup.com> Acked-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
* mpc5121: cpu/mpc512x/diu.c: fix warningsAnatolij Gustschin2010-03-21-2/+2
| | | | | | | | | | | Fix warnings while compiling with CONFIG_VIDEO enabled: diu.c: In function 'video_hw_init': diu.c:158: warning: 'return' with no value, in function returning non-void diu.c:162: warning: format '%ld' expects type 'long int', but argument 6 has type 'int' diu.c:162: warning: format '%ld' expects type 'long int', but argument 7 has type 'int' Signed-off-by: Anatolij Gustschin <agust@denx.de>
* console.c: fix problem with splashimageAnatolij Gustschin2010-03-21-3/+7
| | | | | | | | | | | | | | | | | | If a board uses cfb_console driver and splash image and also defines CONFIG_SILENT_CONSOLE, the user is locked out even if "silent" is not set. It is not possible to get any output, neither on vga console device nor on serial console after redirecting the output to the serial console, since the GD_FLG_SILENT flag remains set. Fix the problem by redirecting the output from frame buffer to serial console if splashimage is used. Only suppress the output if "silent" environment variable was set and don't set the GD_FLG_SILENT flag arbitrarily. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* mod change 755 => 644 for multiple filesThomas Weber2010-03-21-0/+0
| | | | | | | | I executed 'find . -name "*.[chS]" -perm 755 -exec chmod 644 {} \;' Signed-off-by: Thomas Weber <swirl@gmx.li> Add some more: neither Makefile nor config.mk need execute permissions. Signed-off-by: Wolfgang Denk <wd@denx.de>
* mxcmmc: fix warnings due to access 32 bit registers with 16 bit accessorsStefano Babic2010-03-21-18/+18
| | | | | | | | | Some registers of the mxcmmc driver were accessed using 16 bit accessor functions, because only the LSB is significant. This is not needed and generates warnings. Signed-off-by: Stefano Babic <sbabic@denx.de>
* TFTP: allow for adjustable retransmission timoutWolfgang Denk2010-03-21-8/+34
| | | | | | | | | | | | | So far, TFTP negotiated a fixed retransmission timeout of 5 seconds. In some cases (busy networks, slow TFTP servers) this caused very slow transfers. A new environment variable "tftptimeout" allows to set this timeout. Lowering this value may make downloads succeed faster in networks with high packet loss rates or with unreliable TFTP servers. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Ben Warren <biggerbadderben@gmail.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
* Fix PCI_BASE_ADDRESS_5 handling in pci_hose_config_device()Wolfgang Denk2010-03-21-1/+1
| | | | | | Signed-off-by: FUJITA Kazutoshi <fujita@soum.co.jp> Signed-off-by: <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
* cmd_mmc remove \nFrans Meulenbroeks2010-03-21-1/+1
| | | | | | | | This patch removes the \n after the help message for mmcinfo. This resulted in an empty line being displayed after the mmcinfo line when the help command was given. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
* nios2: Added support to YANU UARTRenato Andreola2010-03-16-1/+282
| | | | Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* nios2: use generic unaligned.hThomas Chou2010-03-16-0/+6
| | | | Signed-off-by: Scott McNutt <smcnutt@psyent.com>
* Merge branch 'master' of git://git.denx.de/u-boot-videoWolfgang Denk2010-03-14-9/+12
|\
| * video: Fix console display when splashscreen is usedMatthias Weisser2010-03-13-9/+12
| | | | | | | | | | | | | | | | | | If a splashscreen is used the console scrolling used the scroll size as needed when a logo was displayed. This patch sets the scroll size to the whole screen if a splashscreen is shown. Signed-off-by: Matthias Weisser <matthias.weisser@graf-syteco.de>
* | asm-blackfin/unaligned.h: add for zlib codeMike Frysinger2010-03-14-0/+1
| | | | | | | | | | | | | | The new zlib code wants asm/unaligned.h, so have the Blackfin version pull in the asm-generic/unaligned.h. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | asm-generic/unaligned.h: dynamic default unaligned accessesMike Frysinger2010-03-14-0/+23
|/ | | | | | | This is based on the asm-arm/unaligned.h, but made generic so all arches that cannot do unaligned accesses can utilize it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Prepare v2010.03-rc1v2010.03-rc1Wolfgang Denk2010-03-12-39/+5797
| | | | | | Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
* standalone eepro100_eeprom: fix build errorWolfgang Denk2010-03-12-2/+1
| | | | | | | | | | | | | | | | Building examples/standalone/eepro100_eeprom triggers this error: In file included from include/common.h:629, from eepro100_eeprom.c:24: include/net.h: In function 'NetReadIP': include/net.h:430: warning: implicit declaration of function 'memcpy' eepro100_eeprom.c: At top level: eepro100_eeprom.c:81: error: conflicting types for 'memcpy' include/net.h:430: error: previous implicit declaration of 'memcpy' was here Fix this. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Update .gitignore's: add some generated filesWolfgang Denk2010-03-12-2/+4
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* mpc82xx: Remove SL8245 board and the now orpahned sk98lin network driver.Detlev Zundel2010-03-12-46370/+0
| | | | | | | | | This code has compile problems and the company does not even exist any more. So we take the liberty to drop support for it. Signed-off-by: Detlev Zundel <dzu@denx.de> CC: Wolfgang Denk <wd@denx.de> CC: Ben Warren <biggerbadderben@gmail.com>
* 85xx: Drop FIT support to allow u-boot image to fit in 512kKumar Gala2010-03-12-4/+0
| | | | | | | The 36-bit build exceeds the 512k size we have. Removing FIT type image support allows us to fit and we dont really use it. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Cosmetic change - indentation correction.Michael Zaidman2010-03-12-2/+2
| | | | Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com>
* cmd_mtdparts.c: prevent printbuffer overflowsAnatolij Gustschin2010-03-12-2/+8
| | | | | | | | | The length of configured MTDPARTS_DEFAULT string could be greater than console printbuffer size. Replace printf() by puts() to avoid potential buffer overflows. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* Fix MPC8536DS documentationFrans Meulenbroeks2010-03-12-1/+1
| | | | | | | | | | | | This patch corrects small mistake in the register list in doc/README.mpc8536ds. These registers are 32 bits and this one starts at ....c not ....e When using the ...c address I can boot from sd, when using the ...e address I cannot. Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Acked-by: Hu Mingkai <B21284@freescale.com>
* doc: add README for CONFIG_HWCONFIG optionHeiko Schocher2010-03-12-0/+50
| | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* TQM8xx: enable device tree support on all TQM8xx based boards.Heiko Schocher2010-03-12-0/+96
| | | | | | | | | | | | | Also enable support for CONFIG_HWCONFIG because we use this for configuring if this hardware has a FEC or not. syntax: hwconfig=fec:on if hardware has an fec hwconfig=fec:off if hardware has no fec Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
* TQM8xx: add device tree support for TQM8xx based boards.Heiko Schocher2010-03-12-0/+119
| | | | | | | | | | | | | Also use hwconfig to configure whether the board has a FEC or not. We then can adjust the DTS to tell Linux if there is a FEC present. syntax: hwconfig=fec:on if hardware has a FEC hwconfig=fec:off if hardware has no FEC Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
* Move CONFIG_UPDATE_TFTP code after CONFIG_PREBOOTWolfgang Denk2010-03-11-4/+4
| | | | | | | | | | | | The auto-update feature (CONFIG_UPDATE_TFTP) requires that the env variable serverip be set for the TFTP access. If DHCP is to be used to get the serverip env variable, this doesn't work as DHCP happens after the auto-update attempt has run. A solution is to run DHCP in PREBOOT, but even this is too late. To solve this, we move update_tftp() below the PREBOOT stuff. Signed-off-by: Wolfgang Denk <wd@denx.de>
* mkimage: dont force entry point with xipMike Frysinger2010-03-11-14/+0
| | | | | | | | | | | Some people boot images with the entry point in the middle of the blob (like Linux with the head code in discardable .init.text), and there is no no real requirement that the entry point be right after the mkimage header when doing XIP, so let people specify whatever they want. If they do need an entry right after the header, then they still can do that with normal -e behavior. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* PPC: Record U-Boot's relocated address in RAM and show in bdinfo.Richard Retanubun2010-03-11-6/+3
| | | | | | | | | | | This patch uses gd->relocaddr variable to store uboot's relocated address in RAM and shows it in bdinfo command. This patch moves CONFIG_AMIGAONEG3SE style copying of the address in board_init_f to just before relocation is actually done. Signed-off-by: Richard Retanubun <RichardRetanubun@RuggedCom.com> Tested-by: Detlev Zundel <dzu@denx.de>
* Fix memory leak in mmc_read()Wolfgang Denk2010-03-11-1/+1
| | | | | | | | | There is be a path through mmc_read in drivers/mmc/mmc.c where malloc'd memory is not freed before exiting mmc_read: it occurs if mmc_set_blocklen() returns a non-zero value. Reported-by: Quentin Armitage <Quentin@Armitage.org.uk> Signed-off-by: Wolfgang Denk <wd@denx.de>