summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* atmel_mci: Fix data timeout valueHaavard Skinnemoen2007-08-13-0/+59
| | | | | | | | | Calculate the data timeout based on values from the CSD instead of just using a hardcoded DTOR value. This is a backport of a similar fix in BSP 2.0, with one additional fix: the DTOCYC value is rounded up instead of down. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
* AVR32: Include <div64.h> instead of <asm/div64.h>Haavard Skinnemoen2007-08-13-1/+1
| | | | | | | | | | | include/asm-avr32/div64.h was recently moved to include/div64.h, but cpu/at32ap/interrupts.c wasn't properly updated (an earlier version of the patch was merged perhaps?) This patch updates cpu/at32ap/interrupts.c so that the avr32 port compiles again. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
* Merge commit 'upstream/master'Haavard Skinnemoen2007-08-13-122977/+60275
|\
| * Update CHANGELOGWolfgang Denk2007-08-12-0/+1038
| |
| * Minor alignment of output, 2nd try.Wolfgang Denk2007-08-12-2/+2
| | | | | | | | | | | | Also update CHANGELOG Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Minor alignment of outputWolfgang Denk2007-08-12-2/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Cleanup output on ADS5121 boardWolfgang Denk2007-08-12-2/+0
| | | | | | | | Signed-off-by: Wolfgang Denk
| * Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/masterWolfgang Denk2007-08-12-16/+52
| |\
| | * Adapt board configuration and fix kernel crash on MCC200 board.Wolfgang Denk2007-08-12-16/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The update procedure was modified to turn off the USB subsystem before exit for MCC200 and TRAB. This is necessary as otherwise the USB controller continues to write periodically to system memory! MCC200-specific notes: - the patch disables the magic key check for MCC200 - the patch contains the configuration changes made for the new revision of the board. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Adjust default configuration of ADS5121 board.Wolfgang Denk2007-08-12-28/+18
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | Clean up some remaining CFG_CMD_ -> CONFIG_CMD_ issues.Wolfgang Denk2007-08-12-41/+34
| |/ | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Merge with /home/wd/git/u-boot/custodian/u-boot-fdtWolfgang Denk2007-08-11-453/+689
| |\
| | * Improve error print messages.Gerald Van Baren2007-08-10-31/+21
| | | | | | | | | | | | Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * fdt: allow for builds that don't want env and bd_t nodesKim Phillips2007-08-10-23/+15
| | | | | | | | | | | | | | | | | | | | | protect fdt_env and fdt_bd_t invocations, fix codingstyle while in the area. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * fdt: do board setup based on fdt address specified on bootm lineKim Phillips2007-08-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last fdt patch to bootm did board setup based on the address specified by a prior fdt address command invocation. The bootm code, as its call to fdt_chosen does, should use the fdt specified by the user on the bootm command. Note this restores full functionality for the 8360's existing default boot environment values, e.g. 'run nfsboot' (i.e. no having to 'fdt addr $fdtaddr' before booting a kernel). Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * Call ft_board_setup() from the bootm command.Gerald Van Baren2007-08-10-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the patch titled "Create new fdt boardsetup command..." I removed the call to ft_board_setup() from the routine fdt_chosen(), but I forgot to add a direct call back into cmd_bootm.c This fixes the oversight by adding the direct call to the bootm command. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Create new fdt boardsetup command, fix bug parsing [] form of set values.Gerald Van Baren2007-08-10-25/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously ft_board_setup() was called by fdt_chosen() which was not really correctly structured. This splits ft_board_setup() out by creating a new fdt boardsetup command. Fix a bug when parsing fdt set command values which have the square bracket form [00 11 22 33] - the length was updated incorrectly in when parsing that form. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Tighten up the error messages.Gerald Van Baren2007-08-10-22/+11
| | | | | | | | | | | | Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Asthetic improvements: error messages and line lengths.Gerald Van Baren2007-08-10-65/+61
| | | | | | | | | | | | | | | | | | Tighten up the error messages, split overlength lines. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Fix fdt_chosen() to call ft_board_setup(), clean up long lines.Gerald Van Baren2007-08-10-39/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | The fdt_chosen() function was adding/seting some properties ad-hoc improperly and duplicated (poorly) what was done in ft_board_setup() Clean up long lines (setting properties, printing errors). Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * For fdt_find_node_by_path(), handle the root path properly.Gerald Van Baren2007-08-10-23/+16
| | | | | | | | | | | | | | | | | | | | | Also removes the special case root path detection in cmd_fdt.c since it is no longer necessary. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Add fdt_find_node_by_type() and fdt_find_compatible_node() to LIBFDTGerald Van Baren2007-08-10-18/+149
| | | | | | | | | | | | | | | Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Replace fdt_node_offset() with fdt_find_node_by_path().Gerald Van Baren2007-08-10-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | The new name matches more closely the kernel's name, which is also a much better description. Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Fix cmd_fdt line lengths, refactor code.Gerald Van Baren2007-08-10-187/+239
| | | | | | | | | | | | | | | | | | | | | | | | Break lines that were greater than 80 characters in length. Move the fdt print and property parsing code to separate static functions to reduce coding clutter in the fdt_cmd handling body. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * FDT command improvements.Gerald Van Baren2007-08-10-128/+143
| | | | | | | | | | | | | | | | | | | | | Fix "fdt set" so that it will create a non-existing property. Add "fdt mknode" to create nodes. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Reorganize and fix problems (returns) in the bootm command.Gerald Van Baren2007-08-10-66/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do *NOT* return after the "point of no return" has been passed. If something goes wrong, the board must be reset after that point. Move the "Transferring control to Linux" debug message back to where it belongs: just before transferring control to linux. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Fix bugs in the CONFIG_OF_LIBFDTGerald Van Baren2007-08-10-2/+2
| | | | | | | | | | | | | | | | | | Stupid coding mistakes (identified by Timur Tabi, thanks). Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Improve fdt move length handling.Gerald Van Baren2007-08-10-6/+15
| | | | | | | | | | | | | | | | | | | | | Make the length parameter optional: if not specified, do the move using the current size unchanged. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Minor code clean up.Gerald Van Baren2007-08-10-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Declare the variable fdt properly as extern. Call the "set_fn" function pointer the "short way" without the full dereferencing syntax. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Improve error messages, more informative.Gerald Van Baren2007-08-10-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | Print more than the raw libfdt error message strings. This is especially useful for cluing in the user when the bootm command aborts due to blob problems. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * libfdt: Conditionally compile based on CONFIG_OF_LIBFDTGerald Van Baren2007-08-10-0/+31
| | | | | | | | | | | | | | | | | | | | | This is the way u-boot reduces configured-out code. At Wolfgang Grandegger and Wolfgang Denk's request, make libfdt conform. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| | * Merge git://www.denx.de/git/u-bootGerald Van Baren2007-08-10-1639/+12826
| | |\
| | * \ Merge git://www.denx.de/git/u-bootGerald Van Baren2007-08-07-291/+693
| | |\ \
| | * | | Add CONFIG_BIOSEMU define to guard all the bios emulator codeJason Jin2007-08-07-0/+32
| | | | | | | | | | | | | | | | | | | | This patch fix the compile issue on the board that did not enable the bios emulator
| * | | | add image size and descriptors for Spartan 3E FPGA chipsBruce Adler2007-08-11-0/+24
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1) Signed-off by: Bruce Adler <bruce.adler@ccpu.com>
| * | | make MAKEALL more immune to merge conflictsKim Phillips2007-08-10-148/+439
| | | | | | | | | | | | | | | | | | | | | | | | ..by placing board entries one per line, as suggested by jdl. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * | | README: Remove outdated cpu type, board type, and NAME_config listsKim Phillips2007-08-10-136/+4
| | | | | | | | | | | | | | | | Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * | | mpc83xx: Suppress the warning 'burstlen'Dave Liu2007-08-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | suppress the warning 'burstlen' of spd_sdram. Signed-off-by: Dave Liu <daveliu@freescale.com>
| * | | Merge with git+ssh://sr@pollux.denx.org/home/wd/git/u-boot/from_stefanStefan Roese2007-08-10-15/+12
| |\ \ \
| | * \ \ Merge with git+ssh://atlas/home/wd/git/u-boot/masterWolfgang Denk2007-08-10-15/+12
| | |\ \ \
| | | * \ \ Merge with /home/wd/git/u-boot/workWolfgang Denk2007-08-10-15/+12
| | | |\ \ \
| | | | * | | Make use of generic 64bit division in nand_util.cDirk Behme2007-08-10-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use generic 64bit division in nand_util.c. This makes nand_util.c independent of any toolchain 64bit division. Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
| | | | * | | Move 64bit division from avr32 to generic libDirk Behme2007-08-10-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the 64bit division from lib_avr32 to lib_generic. With this, all boards can do_div/__div64_32 if needed, not only avr one. Code is put to lib_generic, so no larger memory footprint if not used. No code modifications. Thanks for proposal by HÃ¥vard Skinnemoen. Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
| * | | | | | Conding style cleanupStefan Roese2007-08-10-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Roese <sr@denx.de>
| * | | | | | Merge with git://www.denx.de/git/u-boot.gitStefan Roese2007-08-10-832/+1594
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mpc83xx: fix ITX[GP] O=builddir buildsKim Phillips2007-08-10-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make: *** No rule to make target `/work/wd/tmp/board/mpc8349itx/u-boot.lds', needed by `/work/wd/tmp/u-boot'. Stop. Both the ITX and ITX-GP fail when you use "make O=<some dir> ..." or "BUILD_DIR=<some dir> ./MAKEALL ..." Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | | | mpc83xx: Correct the README for DDR ECCDave Liu2007-08-10-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the README for DDR ECC, change the name to README.mpc83xx.ddrecc. Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | | | mpc83xx: Consolidate the ECC support of 83xxDave Liu2007-08-10-706/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the duplicated source code of ecc command on the <board>.c, for reused, move these code to cpu/mpc83xx directory. Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| | * | | | | mpc83xx: Correct the burst length for DDR2 with 32 bitsDave Liu2007-08-10-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The burst length should be 4 for DDR2 with 32 bits bus Signed-off-by: Dave Liu <daveliu@freescale.com>
| | * | | | | mpc83xx: add support for the MPC8323E RDBKim Phillips2007-08-10-0/+952
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPC8323E based board with 64MB fixed SDRAM, 16MB flash, five 10/100 ethernet ports connected via an ICPlus IP175C switch, one PCI slot, and serial. Features not supported in this patch are SD card interface, 2 USB ports, and the two phone ports. Signed-off-by: Michael Barkowski <michael.barkowski@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>