summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 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
| | |
| * | bootm: mark local boot_os[] table staticMike Frysinger2009-11-24-1/+1
| | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | mkconfig: deny messed up ARCH definitionNishanth Menon2009-11-24-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refuse to setup a platform if the command line ARCH= is not the same as the one required for the board. This prevents any user with prehistoric aliases from messing up their builds. Reported in thread: http://old.nabble.com/-U-Boot--Build-breaks-on-some-OMAP3-configs-to26132721.html Inputs from: Mike Frysinger and Wolfgang Denk: http://lists.denx.de/pipermail/u-boot/2009-November/063642.html Cc: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Anand Gadiyar <gadiyar@ti.com> Cc: Dirk Behme <dirk.behme@googlemail.com> Signed-off-by: Nishanth Menon <nm@ti.com>
| * | Merge branch 'master' of git://git.denx.de/u-boot-netWolfgang Denk2009-11-24-8/+24
| |\ \
| | * | Repair the 'netretry=once' option.Remy Bohmer2009-11-24-8/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | 'netretry = once' does the same as 'netretry = yes', because it is not stored when it was tried once. Signed-off-by: Remy Bohmer <linux@bohmer.net> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| * | Merge branch 'master-sync' of git://git.denx.de/u-boot-armWolfgang Denk2009-11-24-1/+2
| |\ \
| | * | OMAP3: pandora: fix booting without serial attachedGrazvydas Ignotas2009-11-24-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the board is booted without serial cable attached (which is how most of them will be used) UART RX is left floating and sometimes picks noise, which interrupts countdown and enters U-Boot prompt instead of booting the kernel. Fix this by setting up internal pullup on UART RX pin. This does not prevent serial from working as the internal pullup is weak. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
| * | | Repair build fail in case CONFIG_PPC=n and CONFIG_FIT=yRemy Bohmer2009-11-24-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Remy Bohmer <linux@bohmer.net>
| * | | Add support for CS2 dataflash for Atmel-SPI.Remy Bohmer2009-11-23-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The only missing chipselect line support is CS2, and I need it on CS2... Signed-off-by: Remy Bohmer <linux@bohmer.net>
| * | | Fix mingw tools buildRemy Bohmer2009-11-23-0/+159
| | | | | | | | | | | | | | | | | | | | | | | | mkimage does not build due to missing strtok_r() and getline() implementation Signed-off-by: Remy Bohmer <linux@bohmer.net>
| * | | Building of FIT images does not work.Remy Bohmer2009-11-23-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | The type is not set for generation of the FIT images, resulting in no images being created without printing or returning an error Signed-off-by: Remy Bohmer <linux@bohmer.net>
| * | sf: fix stmicro offset setup while erasingMike Frysinger2009-11-22-1/+2
| | | | | | | | | | | | | | | Reported-by: Peter Gombos <gombos@protecta.hu> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | sf: new driver for Winbond W25X16/32/64 devicesJason McMullan2009-11-22-0/+339
| | | | | | | | | | | | | | | Signed-off-by: Jason McMullan <jason.mcmullan@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | mpc8260: move FDT memory node fixup into common CPU code.Marcel Ziswiler2009-11-22-52/+2
| | | | | | | | | | | | | | | Signed-off-by: Marcel Ziswiler <marcel.ziswiler@noser.com> Tested-by: Heiko Schocher <hs@denx.de>
| * | Add driver for FTRTC010 real time clockPo-Yu Chuang2009-11-22-0/+125
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | MIMC200: set default fbmem valueMark Jackson2009-11-22-1/+1
| | | | | | | | | | | | | | | | | | | | | This patch adds a default bootargs "fbmem" value to the CONFIG_BOOTARGS string for the MIMC200 board. Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
| * | ppc4xx: Initialize magnetic coupler on VOM405 boardsMatthias Fuchs2009-11-17-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an ugly behavior of the IL712 magnetic coupler as used on VOM405. These parts will remember their last state over a power cycle which might cause unwanted behavior. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | ppc4xx: Initialize magnetic couplers in PLU405Matthias Fuchs2009-11-17-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an ugly behavior of the IL712 magnetic couplers as used on PLU405. These parts will remember their last state over a power cycle which might cause unwanted behavior. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
| * | Add minimal SJA1000 header for basic CAN modeMatthias Fuchs2009-11-17-0/+60
| |/ | | | | | | | | | | | | This patch is in preparation for the upcoming PLU405 board fix. Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu> Signed-off-by: Stefan Roese <sr@denx.de>
* | zlib: Optimize decompressionJoakim Tjernlund2009-12-05-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch optimizes the direct copy procedure. Uses get_unaligned() but only in one place. The copy loop just above this one can also use this optimization, but I havn't done so as I have not tested if it is a win there too. On my MPC8321 this is about 17% faster on my JFFS2 root FS than the original. No speed test has been performed in u-boot. Size increase on ppc: 484 bytes Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se> Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
* | add lzop decompression supportPeter Korsgaard2009-12-05-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | Add lzop decompression support to the existing lzo bitstream handling (think gzip versus zlib), and support it for uImage decompression if CONFIG_LZO is enabled. Lzop doesn't compress as good as gzip (~10% worse), but decompression is very fast (~0.7s faster here on a slow ppc). The lzop decompression code is based on Albin Tonnerre's recent ARM Linux lzo support patch. Cc: albin.tonnerre@free-electrons.com Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* | Generic udelay() with watchdog supportIngo van Lil2009-12-05-62/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | According to the PPC reference implementation the udelay() function is responsible for resetting the watchdog timer as frequently as needed. Most other architectures do not meet that requirement, so long-running operations might result in a watchdog reset. This patch adds a generic udelay() function which takes care of resetting the watchdog before calling an architecture-specific __udelay(). Signed-off-by: Ingo van Lil <inguin@gmx.de>