summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of /home/wd/git/u-boot/custodiansWolfgang Denk2009-07-23-268/+402
|\
| * Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2009-07-23-268/+402
| |\
| | * 85xx/86xx: Replace in8/out8 with in_8/out_8 on FSL boardsKumar Gala2009-07-22-86/+122
| | | | | | | | | | | | | | | | | | | | | The pixis code used in8/out8 all over the place. Replace it with in_8/out_8 macros. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * xpedite5370: Enable NAND command supportPeter Tyser2009-07-22-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the MPC8572's eLBC to access 1 GB (or greater) onboard NAND flash via the 'nand' command. Previously, the XPedite5370's NAND chip selects were properly configured, but NAND support was not enabled. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * xes: Increase CONFIG_SYS_BOOTM_LEN to 16MBPeter Tyser2009-07-22-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increasing CONFIG_SYS_BOOTM_LEN from 8 MB to 16 MB is necessary to support uncompressing images larger than 8 MB when using the bootm command. Note that recent Linux kernels for the 85xx and 86xx map greater than 16MB of memory on bootup, but we use 16MB to maintain compatibility with older Linux kernels for now. Signed-off-by: Nate Case <ncase@xes-inc.com> Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * xpedite5370: Fix I2C GPIO initialization typoPeter Tyser2009-07-22-2/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Acked-by: Heiko Schocher<hs@denx.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * xpedite5200,5370: Use buffered NOR flash writesPeter Tyser2009-07-22-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Buffered writes are possible on the XPedite5200 and XPedite5370 and greatly improve NOR flash write speeds Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * 85xx, 86xx: Add common board_add_ram_info()Peter Tyser2009-07-22-41/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, 85xx and 86xx boards would display DRAM information on bootup such as: ... I2C: ready DRAM: Memory controller interleaving enabled: Bank interleaving! 2 GB FLASH: 256 MB ... This patch moves the printing of the DRAM controller configuration to a common board_add_ram_info() function which prints out DDR type, width, CAS latency, and ECC mode. It also makes the DDR interleaving information print out in a more sane manner: ... I2C: ready DRAM: 2 GB (DDR2, 64-bit, CL=4, ECC on) DDR Controller Interleaving Mode: bank FLASH: 256 MB ... Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * tqm85xx: Remove board_add_ram_info()Peter Tyser2009-07-22-30/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for adding one common 8xxx board_add_ram_info() function for all 8xxx boards Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * xes: Remove 8xxx board_add_ram_info() functionPeter Tyser2009-07-22-53/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for adding one common 8xxx board_add_ram_info() fuction for all 8xxx boards Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * 86xx: Rename ccsr_ddr's sdram_mode_1, sdram_cfg_1 fieldsPeter Tyser2009-07-22-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Rename sdram_mode_1 to sdram_mode and sdram_cfg_1 to sdram_cfg to match the 86xx user's manual and other Freescale architectures Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * 85xx: Add pci/pcie E1000 ethernet support for MPC8544DS and MPC8536 boardsRoy Zang2009-07-22-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Roy Zang <tie-fei.zang@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * 85xx: Report which "bank" of NOR flash we are booting from on FSL boardsKumar Gala2009-07-22-14/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The p2020DS, MPC8536DS, MPC8572DS, MPC8544DS boards are capable of swizzling the upper address bits of the NOR flash we boot out of which creates the concept of "virtual" banks. This is useful in that we can flash a test of image of u-boot and reset to one of the virtual banks while still maintaining a working image in "bank 0". The PIXIS FPGA exposes registers on LBC which we can use to determine which "bank" we are booting out of (as well as setting which bank to boot out of). Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * 86xx: Report which "bank" of NOR flash we are booting from on MPC8641HPCNKumar Gala2009-07-22-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MPC8641HPCN board is capable of swizzling the upper address bit of the NOR flash we boot out of which creates the concept of "virtual" banks. This is useful in that we can flash a test of image of u-boot and reset to one of the virtual banks while still maintaining a working image in "bank 0". The PIXIS FPGA exposes registers on LBC which we can use to determine which "bank" we are booting out of (as well as setting which bank to boot out of). Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * 85xx: Bump up the BOOTMAP to 16M on FSL 85xx boardsKumar Gala2009-07-21-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | We have always mapped at least 16M in the kernel and we have seen cases with new kernel features that a kernel image needs more than 8M of memory. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | Merge branch 'master' of /home/wd/git/u-boot/master/Wolfgang Denk2009-07-23-2018/+2275
| |\ \
| * \ \ Merge branch 'master' of git://git.denx.de/u-boot-i2cWolfgang Denk2009-07-20-4/+0
| |\ \ \
| | * | | Remove last remanants of unused CONFIG_I2C_CMD_TREEPeter Tyser2009-07-20-4/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * | | | Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk2009-07-20-2/+2
| |\ \ \ \
| | * | | | ubi: help message correctionAndrzej Wolski2009-07-20-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect information about size units and correct typo. Signed-off-by: Andrzej Wolski <awolski@poczta.fm> Signed-off-by: Stefan Roese <sr@denx.de>
* | | | | Fix "ld: cannot find -lstubs" build errorWolfgang Denk2009-07-22-3/+3
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 1bc15386 moved the examples/ to examples/standalone but failed to adapt the Makefiles that need to link against libstubs.a Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | | | Refresh LZMA-lib to v4.65Luigi 'Comio' Mantellini2009-07-22-1859/+2016
| | | | | | | | | | | | | | | | Signed-off-by: Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
* | | | AT91: factor out ROUND() macroWolfgang Denk2009-07-22-10/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | A large number of boards (all AT91 based) duplicated the ROUND() macro in their board specific config files. Add the definition to include/common.h and clean up the board config files. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | Move api_examples to examples/apiPeter Tyser2009-07-21-6/+7
| | | | | | | | | | | | | | | | | | | | | Also add a rule to remove demo.bin which was previously leftover after a "make clean" Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | | 83xx, kmeter: fix compile errorHeiko Schocher2009-07-21-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SYS_MALLOC_LEN is defined in the board config, and the keymile-common.h, which collects common options used by all keymile-boards. This results in a compile error when compiling the kmeter1 board. So remove this define in the board config file. Signed-off-by: Heiko Schocher <hs@denx.de>
* | | Move examples/ to examples/standalonePeter Tyser2009-07-21-6/+10
| | | | | | | | | | | | | | | | | | | | | The current files in examples are all standalone application examples, so put them in their own subdirectory for organizational purposes Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | | Move architecture specific config.mk files into subdirsPeter Tyser2009-07-21-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This cleans up U-Boot's toplevel directory a bit and makes the architecture 'config.mk' file naming and location similar to board and cpu 'config.mk' files Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | | Add "tags" to .gitignore file.Po-Yu Chuang2009-07-21-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | powerpc: updates for the keymile boardsHeiko Schocher2009-07-21-54/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CONFIG_SYS_MAX_I2C_BUS changed to 1 We use only one I2C hardwarecontroller on this boards, so change the CONFIG_SYS_MAX_I2C_BUS to 1. - common: dont print errormsg if second IVM Block lacks. - 82xx, mgcoge: fix double mtdpart entry in environment - 82xx, mgcoge: activate on second Flash the second bank. - common: CONFIG_ENV_SIZE 0x4000 for all keymile boards - common: Change malloc size to 1MByte for all Keymile boards We need a bigger malloc area for the environment support (128k) on some Keymile boards (kmeter1) and the upcoming UBI support. Change it to 1MB for all Keymile boards to be on the save side. Also define CONFIG_SYS_64BIT_VSPRINTF which is needed for UBI/UBIFS support. - Add UBI support to all Keymile boards - change manner of writing "/localbus/ranges" node instead of writting the complete "/localbus/ranges" node before booting Linux, only update the ranges entries which gets dynamical detected (size of flashes). This is needed, because keymile adds in the DTS "/localbus/ranges" node entries, which u-boot must not overwrite/delete. - kmeter, mgcoge: define 2 seperate regions needed for the Intel P30 chips The Intel P30 chip has 2 non-identical chips on one die, so we need to define 2 seperate regions that are scanned by physmap_of independantly. - kmeter1: Add MTD concat support to Keymile boards - 82xx, mgcoge: add "unlock=yes" to default environment - added CONFIG_MTD_DEVICE to get in sync with mainline code Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | | fsl_sata: Fix compiler warnings shown by gcc-4.4galak2009-07-20-81/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update fsl_sata to use common structures instead of casting back and forth between the fsl specific ones and the common ones (which are identical). fsl_sata.c: In function 'scan_sata': fsl_sata.c:550: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:549: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:548: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:545: note: initialized from here fsl_sata.c:592: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:590: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:588: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:586: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:579: warning: dereferencing pointer 'cfis' does break strict-aliasing rules ... Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | Add unaligned.h for armSimon Kagstrom2009-07-20-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds unaligned.h for ARM (needed to build with LZO compression). The file is taken from the linux kernel, but includes u-boot headers instead. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Acked-by: Stefan Roese <sr@denx.de>
* | | Remove last remanants of unused CONFIG_I2C_CMD_TREEPeter Tyser2009-07-20-4/+0
| | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
* | | ubi: help message correctionAndrzej Wolski2009-07-20-2/+2
|/ / | | | | | | | | | | | | Fix incorrect information about size units and correct typo. Signed-off-by: Andrzej Wolski <awolski@poczta.fm> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2009-07-20-8/+51
|\ \
| * | Blackfin: bf537-{minotaur,srv1}: do not hardcode CONFIG_ETHADDRMike Frysinger2009-07-18-6/+4
| | | | | | | | | | | | | | | | | | | | | MAC addresses should not be hardcoded in boards to avoid random link level conflicts. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf533-stamp: back down SCLK a bitMike Frysinger2009-07-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | While the 1.0 and 1.2 spin of the bf533-stamp boards can handle the higher SCLK speeds just fine, the 1.1 spin cannot due to the bugs introduced with the shortened SDRAM traces. So lower the SCLK speed down to a value that all three can handle. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: split cpu COBJS into multilinesMike Frysinger2009-07-18-1/+7
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: add os log functionsMike Frysinger2009-07-18-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | Part of the mini Blackfin ABI with operating systems is that they can use 0x4f0-0x4f8 to pass log buffers to/from bootloaders. So add support to U-Boot for reading the log buffer. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | Merge branch 'master' of git://git.denx.de/u-boot-mpc83xxWolfgang Denk2009-07-20-1266/+342
|\ \ \ | |_|/ |/| |
| * | mpc83xx: convert all remaining boards over to 83XX_GENERIC_PCIKim Phillips2009-07-18-1266/+342
| |/ | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | mmc: set bus width to 1 and clock to minimum early during initializationIlya Yanok2009-07-19-0/+3
| | | | | | | | | | | | | | We need to switch back to 1-bit before initialization or SD 2.0 cards will fail to send SCR if we've switched to 4-bit already. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
* | config.mk: Remove unused HPATHShinya Kuribayashi2009-07-19-1/+1
| | | | | | | | | | | | This variable is not unused anywhere. Signed-off-by: Shinya Kuribayashi <skuribay@pobox.com>
* | digsy mtc: Enable command line history.Grzegorz Bernacki2009-07-19-0/+1
| | | | | | | | Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
* | compiler.h: unify system ifdef cruft hereMike Frysinger2009-07-19-149/+150
| | | | | | | | | | | | | | | | | | | | | | Shove a lot of the HOSTCC and related #ifdef checking crap into the new compiler.h header so that we can keep all other headers nice and clean. Also introduce custom uswap functions so we don't have to rely on the non standard implementations that a host may (or may not in the case of OS X) provide. This allows mkimage to finally build cleanly on an OS X system. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | common: fix 'dummy' is used uninitialized in this function warningKim Phillips2009-07-19-1/+1
| | | | | | | | | | | | | | | | | | fix this gcc 4.4 warning: xyzModem.c: In function 'xyzModem_stream_open': xyzModem.c:564: warning: 'dummy' is used uninitialized in this function Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* | push CROSS_COMPILE out to $(ARCH)_config.mkMike Frysinger2009-07-19-42/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | Each arch should handle setting a proper default CROSS_COMPILE value in their own config.mk file rather than having to maintain a large ugly list in the Makefile. By using conditional assignment, we don't have to worry about the variable already being set (env/cmdline/etc...). The common config.mk file takes care of exporting CROSS_COMPILE already, and while a few variables (toolchain ones) utilize CROSS_COMPILE before including the arch config.mk, they do so with deferred assignment. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | malloc.h: protect it against multiple includeJean-Christophe PLAGNIOL-VILLARD2009-07-19-1/+4
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | Fix boards broken after removal of legacy NAND and DoC supportWolfgang Denk2009-07-19-4/+7
| | | | | | | | | | | | | | | | Commit 2419169f removed support for legacy NAND and disk on chip but missed to update the code for a few boards. This patch fixes the resulting build issues. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | cmd_flash.c: fix fix compile error for boards with DataFlashWolfgang Denk2009-07-19-1/+3
| | | | | | | | | | | | | | | | | | | | | | Commit 5669ed45 ("cmd_flash.c: fix warning: unused variable 'addr_first'/'addr_last'") changed the #ifdef logic areound the declaration of these variables and missed a combination of settings of HAS_DATAFLASH with SYS_NO_FLASH; this patch fixes this. Also spotted by Alessandro Rubini <rubini@gnudd.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* | pcm030: fix out-of-tree buildingWolfgang Denk2009-07-19-0/+1
| | | | | | | | | | | | | | Commit 0a87dd90 that was supposed to fix out-of-tree building for the pcm030 board was unfortunately incomplete. Signed-off-by: Wolfgang Denk <wd@denx.de>