summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 5xxx, fdt: move fdt_fixup_memory() to cpu.c fileHeiko Schocher2009-12-08-14/+2
| | | | | | | | u-boot updates, before starting Linux, the memory node in the DTS. As this is a "standard" feature, move this functionality to the cpu.c file for mpc5xxx and mpc512x processors. Signed-off-by: Heiko Schocher <hs@denx.de>
* Merge branch 'master' of ../work into nextWolfgang Denk2009-12-07-10/+1202
|\
| * Update CHANGELOG, prepare -rc2v2009.11-rc2Wolfgang Denk2009-12-07-1/+1190
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * MAKEALL: Fix return valuePeter Tyser2009-12-07-1/+10
| | | | | | | | | | | | | | | | | | | | | | Previously MAKEALL would always return a value of 0, even if 1 or more boards did not compile. This change causes MAKEALL to return 0 if all boards were able to build, otherwise 1. This change also requires changing the script interpreter from sh to bash to support bash's PIPESTATUS variable. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * tools/mkimage: Remove duplicate line of codePeter Tyser2009-12-07-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Recent commits 1a99de2cb4d08eb3bf9fb3f60a9d533150de8c0e and 6a590c5f5fd12cdd27f3153522acfac3854590e7 both fixed the same bug in the same manner. Unfortunately git was "smart" enough to merge both changes which resulted in some duplicate code. Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Reordered code and comment a bit. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * i2c: fix dangling comment in do_i2c_mw()Heiko Schocher2009-12-07-4/+0
| | | | | | | | | | | | | | | | commit bd3784df94bfeca43fbf34094df9cb1bd3ecca3b deleted some unused code in do_i2c_mw(), but missed to also remove the respective commment. This patch fixes this. Signed-off-by: Heiko Schocher <hs@denx.de>
* | mpc52xx, manroland: add some commandsHeiko Schocher2009-12-07-0/+3
| | | | | | | | | | | | | | | | | | | | add the following commands for the manroland boards: CONFIG_CMDLINE_EDITING CONFIG_COMMAND_HISTORY CONFIG_AUTO_COMPLETE Signed-off-by: Heiko Schocher <hs@denx.de>
* | Merge branch 'master' into nextWolfgang Denk2009-12-07-21/+32
|\ \ | |/ | | | | | | | | | | Conflicts: lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * 52xx, manroland: add fdt_fixup_memory() in ft_board_setup()Heiko Schocher2009-12-07-0/+4
| | | | | | | | | | | | | | | | To update the real memory size in the memory node on the uc101 and mucmc52 boards call fdt_fixup_memory() in ft_board_setup(). Signed-off-by: Heiko Schocher <hs@denx.de>
| * Fix computation in nand_util.c:get_len_incl_badDaniel Hobi2009-12-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on offset, flash size and the number of bad blocks, get_len_incl_bad may return a too small value which may lead to: 1) If there are no bad blocks, nand_{read,write}_skip_bad chooses the bad block aware read/write code. This may hurt performance, but does not have any adverse effects. 2) If there are bad blocks, the nand_{read,write}_skip_bad may choose the bad block unaware read/write code (if len_incl_bad == *length) which leads to corrupted data. Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
| * nfs: NfsTimeout() updatesEvan Samanas2009-12-07-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - NfsTimeout() does not correctly update the NFS timeout value which results in NfsTimeout() only being called once in certain situations. This can result in the 'nfs' command hanging indefinetly. For example, the command: nfs 192.168.0.1:/home/user/file will not exit until ctrl-c is pressed if 192.168.0.1 does not have an NFS server running. This issue is resolved by reinitializting the NFS timeout value inside NfsTimeout() when a timeout occurs. - Make the 'nfs' command print the 'T' character when a timeout occurs. Previously there was no indication that timeouts were occuring. - Mimic the 'tftpboot' command and when a download fails print "Retry count exceeded; starting again", and restart the download taking the 'netretry' environment variable into account. Signed-off-by: Evan Samanas <esamanas@xes-inc.com> Signed-off-by: Peter Tyser <ptyser@xes-inc.com> Tested on TQM8xxL. Tested by: Wolfgang Denk <wd@denx.de> Tested on MPC8527DS. Tested by: Ed Swarthout <Ed.Swarthout@freescale.com>
| * bootm: Fix help message's sub-command orderingPeter Tyser2009-12-07-2/+2
| | | | | | | | | | | | | | | | | | | | The help message for the 'bootm' command listed the 'cmdline' and 'bdt' sub-commands in the wrong order which resulted in the error below when following the 'help' command's instructions: "Trying to execute a command out of order" Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * help: Correct syntax of nandecc help output.Robert P. J. Day2009-12-07-1/+1
| | | | | | | | | | | | | | "nandecc" help output should not reproduce the command name, nor have a trailing newline. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
| * smc911x: update SMC911X related configuration descriptionMike Rapoport2009-12-07-5/+5
| | | | | | | | | | | | | | | | | | Since commit 736fead8fdbf8a8407048bebc373cd551d01ec98 "Convert SMC911X Ethernet driver to CONFIG_NET_MULTI API" SMC911X configration options are called CONFIG_SMC911X rather than CONFIG_DRIVER_SMC911X. Update README to reflect that change. Signed-off-by: Mike Rapoport <mike@compulab.co.il>
| * smc911x: fix typo in smc911x_handle_mac_address nameMike Rapoport2009-12-07-2/+2
| | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il>
| * fix nfs symlink name corruptionEd Swarthout2009-12-07-1/+1
| | | | | | | | | | | | | | | | | | An off by one error may cause nfs readlink lookup fail if nfs_path_buff has non-zero data from a previous use. Loading: *** ERROR: File lookup fail Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
| * at91sam9261ek.c: fix minor coding style issue.Wolfgang Denk2009-12-07-4/+5
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * trab: fix warning: implicit declaration of function 'disable_vfd'Wolfgang Denk2009-12-07-0/+2
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * zlib.c: avoid build conflicts for cradle boardWolfgang Denk2009-12-07-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit dce3d79710 updated the zlib code to v0.95; this caused conflicts when building for the "cradle" board, because the (pretty generic) preprocessor variable "OFF" was used in multiple files. Make sure to avoid further conflicts by #undef'ing it in zlib.c before redefining it. Signed-off-by: Wolfgang Denk <wd@denx.de> cc: Giuseppe Condorelli <giuseppe.condorelli@st.com> cc: Angelo Castello <angelo.castello@st.com> cc: Alessandro Rubini <rubini-list@gnudd.com>
| * Fix out-of-tree building of "apollon" board.Wolfgang Denk2009-12-06-0/+1
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | POST: Remove duplicated post_hotkey_pressed() functionsStefan Roese2009-12-07-232/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a weak default function for post_hotkey_pressed(), returning 0, for boards without hotkey support. The long-running tests won't be started on those boards. This default function was implemented in many board directories. By implementing this weak default we can remove all those duplicate versions. Boards with hotkey support, can override this weak default function by defining one in their board specific code. Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' into nextWolfgang Denk2009-12-05-566/+817
|\ \ | |/ | | | | | | | | | | | | Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * lzma: ignore unset filesizesMike Frysinger2009-12-05-3/+6
| | | | | | | | | | | | | | | | | | The Linux kernel build system changed how it compresses things with LZMA such that the header no longer contains the filesize (it is instead set to all F's). So if we get a LZMA image that has -1 for the 64bit field, let's just assume that the decompressed size is unknown and continue on. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * README: Rearrange paragraphs to regain linear arrangement.Detlev Zundel2009-12-05-20/+20
| | | | | | | | | | | | | | Two later additions to the Configuration Option section unfortunately split the description of Show boot progress and the list of its call outs. Signed-off-by: Detlev Zundel <dzu@denx.de>
| * tools/mkimage: Print FIT image contents after creationPeter Tyser2009-12-05-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there was no indication to the user that a FIT image was successfully created after executing mkimage. For example: $ mkimage -f uImage.its uImage.itb DTC: dts->dtb on file "uImage.its" Adding some additional output after creating a FIT image lets the user know exactly what is contained in their image, eg: $ mkimage -f uImage.its uImage.itb DTC: dts->dtb on file "uImage.its" FIT description: Linux kernel 2.6.32-rc7-00201-g7550d6f-dirty Created: Tue Nov 24 15:43:01 2009 Image 0 (kernel@1) Description: Linux Kernel 2.6.32-rc7-00201-g7550d6f-dirty Type: Kernel Image Compression: gzip compressed Data Size: 2707311 Bytes = 2643.86 kB = 2.58 MB Architecture: PowerPC OS: Linux Load Address: 0x00000000 Entry Point: 0x00000000 Hash algo: crc32 Hash value: efe0798b Hash algo: sha1 Hash value: ecafba8c95684f2c8fec67e33c41ec88df1534d7 Image 1 (fdt@1) Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Size: 12288 Bytes = 12.00 kB = 0.01 MB Architecture: PowerPC Hash algo: crc32 Hash value: a5cab676 Hash algo: sha1 Hash value: 168722b13e305283cfd6603dfe8248cc329adea6 Default Configuration: 'config@1' Configuration 0 (config@1) Description: Default Linux kernel Kernel: kernel@1 FDT: fdt@1 This brings the behavior of creating a FIT image in line with creating a standard uImage, which also prints out the uImage contents after creation. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * tools/fit_image.c: Remove unused fit_set_header()Peter Tyser2009-12-05-33/+1
| | | | | | | | | | | | | | | | | | The FIT fit_set_header() function was copied from the standard uImage's image_set_header() function during mkimage reorganization. However, the fit_set_header() function is not used since FIT images use a standard device tree blob header. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * tools/mkimage: Assume FDT image type for FIT imagesPeter Tyser2009-12-05-0/+6
| | | | | | | | | | | | | | | | | | | | | | When building a Flattened Image Tree (FIT) the image type needs to be "flat_dt". Commit 89a4d6b12fd6394898b8a454cbabeaf1cd59bae5 introduced a regression which caused the user to need to specify the "-T flat_dt" parameter on the command line when building a FIT image. The "-T flat_dt" parameter should not be needed and is at odds with the current FIT image documentation. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * EXT2FS: fix inode size for ext2fs rev#0Michael Brandt2009-12-05-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | extfs.c assumes that there is always a valid inode_size field in the superblock. But this is not true for ext2fs rev 0. Such ext2fs images are for instance generated by genext2fs. Symptoms on ARM machines are messages like: "raise: Signal # 8 caught"; on PowerPC "ext2ls" will print nothing. This fix checks for rev 0 and uses then 128 bytes as inode size. Signed-off-by: Michael Brandt <Michael.Brandt@emsyso.de> Tested on: TQM5200S Tested-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * Remove superfluous preprocessor tests from some cmd_*.c files.Robert P. J. Day2009-12-02-8/+0
| | | | | | | | | | | | | | | | | | | | A small number of common/cmd_*.c files contain preprocessor tests that are apparently superfluous since those same tests are used in the Makefile to control the compilation of those files. Those tests are clearly redundant as long as they surround the entirety of the source in those files. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
| * README: Update the list of directories.Robert P. J. Day2009-12-02-1/+5
| | | | | | | | | | | | Bring the directory listing more into line with current content. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
| * Removes dead code in the file common/cmd_i2c.cPratap Chandu2009-12-02-8/+0
| | | | | | | | | | | | | | | | There is some dead code enclosed by #if 0 .... #endif in the file common/cmd_i2c.c This patch removes the dead code. Signed-off-by: Pratap Chandu <pratap.rrke@gmail.com>
| * smc91111_eeprom: drop CONFIG stub protectionMike Frysinger2009-12-02-12/+0
| | | | | | | | | | | | | | Since the Makefile now controls the compilation of this, there is no need for CONFIG checking nor the stub function. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * RTC: Fix return code in MC13783 RTC driver.Magnus Lilja2009-12-02-1/+1
| | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * cmd_date: Fix spelling in error message.Magnus Lilja2009-12-02-3/+3
| | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
| * Move do_irqinfo() to common/cmd_irq.cPeter Tyser2009-12-02-11/+9
| | | | | | | | | | | | | | cmd_irq.c is a much better home and it is already conditionally compiled based on CONFIG_CMD_IRQ. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * cmd_license: Remove unneeded #ifdef CONFIG_CMD_LICENSEPeter Tyser2009-12-02-4/+0
| | | | | | | | | | | | cmd_license is already conditionally compiled at the Makefile-level. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * m41t11: Remove unused functionsPeter Tyser2009-12-02-14/+0
| | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * circbuf: Move to lib_generic and conditionally compilePeter Tyser2009-12-02-1/+1
| | | | | | | | | | | | | | circbuf could be used as a generic library and is only currently needed when CONFIG_USB_TTY is defined. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * Fix build failure in examples/standaloneSanjeev Premi2009-12-02-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of 'make' do not handle trailing white-spaces properly. Trailing spaces in ELF causes a 'fake' source to be added to the variable COBJS; leading to build failure (listed below). The problem was found with GNU Make 3.80. Using text-function 'strip' as a workaround for the problem. make[1]: Entering directory `/home/sanjeev/u-boot/examples/standalone' arm-none-linux-gnueabi-gcc -g -Os -fno-common -ffixed-r8 -msoft-float -D__KERNEL__ -DTEXT_BASE=0x80e80000 -I/home/sanjeev/u-boot/include -fno-builtin -ffreestanding -nostdinc -isystem /opt/codesourcery/2009q1- 203/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/include -pipe -DCONFIG_ ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork -march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector -g -Os -fno-common -ff ixed-r8 -msoft-float -D__KERNEL__ -DTEXT_BASE=0x80e80000 -I/home/sanje ev/u-boot/include -fno-builtin -ffreestanding -nostdinc -isystem /opt/co desourcery/2009q1-203/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.3/includ e -pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-inte rwork -march=armv5 -I.. -Bstatic -T u-boot.lds -Ttext 0x80e80000 -o .c arm-none-linux-gnueabi-gcc: no input files make[1]: *** [.c] Error 1 make[1]: Leaving directory `/home/sanjeev/u-boot/examples/standalone' make: *** [examples/standalone] Error 2 premi # Signed-off-by: Sanjeev Premi <premi@ti.com> Fixed typo (s/ElF/ELF/). Signed-off-by: Wolfgang Denk <wd@denx.de>
| * 85xx: Remove unused CONFIG_ASSUME_AMD_FLASH from config filesBecky Bruce2009-12-02-63/+0
| | | | | | | | | | | | | | A bunch of the 85xx boards have this cruft in them - it's not used anywhere. Delete it. Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
| * MAINTAINERS: update responsible for MPC85xx/86xxWolfgang Denk2009-12-02-1/+1
| | | | | | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Becky Bruce <beckyb@kernel.crashing.org>
| * Merge branch 'master' of git://git.denx.de/u-boot-niosWolfgang Denk2009-12-01-198/+7
| |\
| | * Nios2: do_boom_linux(): kernel gunzip input data integrity problem due toRenato Andreola2009-11-23-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | missing cache flush. Added instruction and data caches flush. Signed-off-by: Scott McNutt <smcnutt@psyent.com>
| | * Nios2: Fix compiler warnings in lib_nios2/board.c (unused variables)Scott McNutt2009-11-23-2/+0
| | | | | | | | | | | | Signed-off-by: Scott McNutt <smcnutt@psyent.com>
| | * Nios2/Nios: Remove unnecessary (residual) linker Nios command scripts fromScott McNutt2009-11-23-196/+2
| | | | | | | | | | | | | | | | | | the standalone examples. Signed-off-by: Scott McNutt <smcnutt@psyent.com>
| * | Fix example FIT image source filesIra W. Snyder2009-11-24-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example FIT image source files do not compile with the latest dtc and mkimage. The following error message is produced: DTC: dts->dtb on file "kernel.its" Error: kernel.its 7:0 - 1:0 syntax error FATAL ERROR: Unable to parse input tree ./mkimage: Can't read kernel.itb.tmp: Invalid argument The FIT image source files are missing the "/dts-v1/;" directive at the beginning of the file. Add the directive to the examples. Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
| * | img2srec: use standard typesMike Frysinger2009-11-24-102/+62
| | | | | | | | | | | | | | | | | | | | | The img2srec code creates a lot of typedefs with common names. These easily clash with system headers that include these typedefs (like mingw). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | tools: gitignore *.exe binariesMike Frysinger2009-11-24-0/+1
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | ppc: Move conditional compilation of kgdb.c to MakefilePeter Tyser2009-11-24-6/+1
| | | | | | | | | | | | Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| * | spi_flash.h: pull in linux/types.h for u## typesMike Frysinger2009-11-24-0/+1
| | |