summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAgeLines
* Big white-space cleanup.Wolfgang Denk2008-05-21-6/+6
| | | | | | | | | | | This commit gets rid of a huge amount of silly white-space issues. Especially, all sequences of SPACEs followed by TAB characters get removed (unless they appear in print statements). Also remove all embedded "vim:" and "vi:" statements which hide indentation problems. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Propagate Error Status to the Shell on fw_printenv ErrorsGrant Erickson2008-05-09-21/+29
| | | | | | | | | | | | Changed implementation such that fw_printenv returns failure status when one or more specified variables do not exist or when incorrect command syntax is used. This aids scripting fw_printenv such that the script can key of the return status rather than relying on standard error "scraping". Signed-off-by: Grant Erickson <gerickson@nuovations.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
* Fix Compilation Errors with 'tools/env/fw_printenv'Grant Erickson2008-05-09-1/+1
| | | | | | | | | | | | | | | | In the current top-of-tree, 1.3.3.-rc2, the optional tool 'tools/env/fw_printenv' fails to compile for two reasons: 1) The header watchdog.h cannot be found. 2) The header zlib.h is picked up from the tool chain rather than the project causing a prototype conflict for crc32. This patch addresses both of these issues. Platforms Tested On: - AMCC "Kilauea" Signed-off-by: Grant Erickson <gerickson@nuovations.com>
* mkimage: make mmap() checks consistentMike Frysinger2008-05-03-13/+9
| | | | | | | | | | The mmap() related code is full of inconsistent casts/constants when it comes to error checking, and may break when building on some systems (like ones that do not implicitly define the caddr_t type). Let's just avoid the whole mess by writing the code nice and clean in the first place. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Update .gitignore for zlib.hKumar Gala2008-04-29-0/+1
| | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Memory footprint optimizationsBartlomiej Sieka2008-04-24-3/+3
| | | | | | | | | | As suggested by Wolfgang Denk: - image printing functions: - remove wrappers - remove indentation prefix from functions' signatures - merge getenv_verify and getenv_autostart into one parametrized function Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
* crc32: use uint32_t rather than unsigned longMike Frysinger2008-04-24-5/+10
| | | | | | | | | | | | | The envcrc.c does sizeof(unsigned long) when calculating the crc, but this is done with the build toolchain instead of the target tool chain, so if the build is a 64bit system but the target is 32bits, the size will obviously be wrong. This converts all unsigned long stuff related to crc32 to uint32_t types. Compile tested only: output of ./tools/envcrc when run on a 32bit build system matches that of a 64bit build system. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Add support for u-boot in svn and localversion-* filesMike Frysinger2008-04-18-0/+14
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Fix out of tree building issueAnatolij Gustschin2008-03-27-7/+13
| | | | | | | Currently U-Boot building in some external directory doesn't work. This patch tries to fix the problem. Signed-off-by: Anatolij Gustschin <agust@denx.de>
* Merge branch 'new-image' of git://www.denx.de/git/u-boot-testingBartlomiej Sieka2008-03-26-332/+389
|\ | | | | | | | | | | | | | | | | Conflicts: common/cmd_bootm.c cpu/mpc8xx/cpu.c Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| * Add MD5 support to the new uImage formatBartlomiej Sieka2008-03-14-2/+10
| | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| * [new uImage] Add support for new uImage format to mkimage toolBartlomiej Sieka2008-03-11-52/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for the new uImage format (FIT) is added to mkimage tool. Commandline syntax is appropriately extended: mkimage [-D dtc_options] -f fit-image.its fit-image mkimage (together with dtc) takes fit-image.its and referenced therein binaries (like vmlinux.bin.gz) as inputs, and produces fit-image file -- the final image that can be transferred to the target (e.g., via tftp) and then booted using the bootm command in U-Boot. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| * [new uImage] New uImage low-level APIMarian Balakowicz2008-03-10-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Add FDT-based functions for handling new format component images, configurations, node operations, property get/set, etc. fit_ - routines handling global new format uImage operations like get/set top level property, process all nodes, etc. fit_image_ - routines handling component images subnodes fit_conf_ - routines handling configurations node Signed-off-by: Bartlomiej Sieka <tur@semihalf.com> Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| * [new uImage] Add libfdt support to mkimageBartlomiej Sieka2008-02-29-3/+84
| | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| * [new uImage] Add sha1.o object to mkimage binary buildBartlomiej Sieka2008-02-29-1/+2
| | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| * [new uImage] Share common uImage code between mkimage and U-bootMarian Balakowicz2008-02-29-234/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the following common routines: 1) Dedicated mkimage print_header() is replaced with common image_print_contents() image_print_contents_noindent() 2) Common os/arch/type/comp fields name <--> id translation routines genimg_get_os_name() genimg_get_arch_name() genimg_get_type_name() genimg_get_comp_name() genimg_get_os_id() genimg_get_arch_id() genimg_get_type_id() genimg_get_comp_id() Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| * [new uImage] Update naming convention for bootm/uImage related codeMarian Balakowicz2008-02-29-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the following prefix convention for the image format handling and bootm related code: genimg_ - dual format shared code image_ - legacy uImage format specific code fit_ - new uImage format specific code boot_ - booting process related code Related routines are renamed and a few pieces of code are moved around and re-grouped. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| * Merge branch 'master' of git://www.denx.de/git/u-boot into new-imageMarian Balakowicz2008-02-29-56/+73
| |\
| * \ Merge branch 'master' of /home/git/u-bootMarian Balakowicz2008-02-21-0/+0
| |\ \
| * | | [new uImage] Define a API for image handling operationsMarian Balakowicz2008-02-07-113/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add inline helper macros for basic header processing - Move common non inline code common/image.c - Replace direct header access with the API routines - Rename IH_CPU_* to IH_ARCH_* Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | | tools/setlocalversion: use a git-describe-ish formatWolfgang Denk2008-03-14-3/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the automatic local version to have the form -nnnnn-gSHA1SUMID, where 'nnnnn' is the number of commits since the last tag (i.e., 1.3.2-rc3). This makes it much easier to recognize "newer" versions and to see how much has been changed since the referenced tag. Stolen from Linux kernel's scripts/setlocalversio, see commit d882421f. Signed-off-by: Wolfgang Denk <wd@denx.de>
* | | make define2mk.sed work on FreeBSDMarcel Moolenaar2008-02-22-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the thread "[1.3.2-rc1] MPC8548CDS/MPC8555CDS configs fails to link", the define2mk.sed script was identified as the source of the link failure on FreeBSD. The problem is that sed(1) does not always support the '+' operator. It isn't on FreeBSD. The attach patch implements the equivalent, using the '*' operator instead and should work everywhere. Signed-off-by: Marcel Moolenaar <marcelm@juniper.net>
* | | easylogo: clean up some more and add -r (rgb) supportMike Frysinger2008-02-22-54/+71
| |/ |/| | | | | | | | | | | | | | | | | | | | | Michael Hennerich added support for outputting an image in RGB format rather than forcing YUYV all the time. This makes obvious sense if the display you have takes RGB input rather than YUYV. Rather than hack in support for options, I've converted it to use getopt and cleaned up the argument parsing in the process. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | add the default Blackfin logo used by Blackfin boards with splash screensMike Frysinger2008-02-04-0/+0
|/ | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Do not reference sha1.c when building mkimage.Mike Frysinger2008-01-09-1/+1
| | | | | | remove sha1.o from mkimage linking since it isn't actually used. Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
* Coding Style cleanup, update CHANGELOGWolfgang Denk2008-01-09-326/+319
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* fix easylogo on big endian dev systemsMike Frysinger2008-01-09-0/+18
| | | | | | | | | | didnt realize how out of shape easylogo actually was until i tried using it. this patch does byte swapping as need be on the input tga header since the tga is in little endian but the host could just as well be big endian. i didnt bother using bswap macros or such stuff from system headers as nothing in POSIX dictates byte swapping functionality. Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
* cleanup easylogoMike Frysinger2008-01-09-7/+18
| | | | | | | | - make the Makefile not suck - include proper headers for prototypes - fix obvious broken handling of strchr() when handling '.' in filenames Signed-Off-By: Mike Frysinger <vapier@gentoo.org>
* Fix build problems under Cygwinraptorbrino@aim.com2008-01-09-0/+1
| | | | | | | | | | | This patch allows u-boot to build without error in a cygwin environment. Cygwin does not define __u64 in it's include/asm/types.h file. The -idirafter flag in the u-boot build causes the inclusion of the cygwin types.h file as opposed to u-bot/include/asm/types.h file which does define __u64. Subsequently, sha1.c compile fails due to unknown symbol. Signed-off-by: Brian Miller <raptorbrino@netscape.net>
* Fix compile problem with new env code.Wolfgang Denk2008-01-09-0/+1
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* tools: fix fw_printenv tool to compile againMarkus Klotzbücher2008-01-09-29/+41
| | | | | | | | | | This patch updates the fw_printenv/fw_setenv userspace tool to include the correct MTD header in order to compile against current kernel headers. Backward compatibility is preserved by introducing an option MTD_VERSION which can be set to "old" for compilation using the old MTD headers. Along with this a number of warnings are fixed. Signed-off-by: Markus Klotzbuecher <mk@denx.de>
* [BUILD] Generate include/autoconf.mk from board config filesGrant Likely2007-11-20-0/+29
| | | | | | | | | | | Use cpp and sed to postprocess config.h and import the defined values into include/autoconf.mk. autoconf.mk is then included by config.mk to give 'make' access to the board configuration. Doing this enables conditional compilation at the Makefile level instead of by wrapping every .c file with #ifdef/#endif wrappers. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
* Add .gitignore filesGrant Likely2007-11-15-0/+9
| | | | | Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com>
* Merge branch 'testing' into workingAndy Fleming2007-08-03-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG fs/fat/fat.c include/configs/MPC8560ADS.h include/configs/pcs440ep.h net/eth.c
| * disk/ doc/ lib_*/ and tools/: Remove lingering references to CFG_CMD_* symbols.Jon Loeliger2007-07-10-1/+1
| | | | | | | | | | | | | | | | Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when IDE really wasn't defined/wanted. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * tools/: Remove obsolete references to CONFIG_COMMANDSJon Loeliger2007-07-09-1/+1
| | | | | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * tools/ : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).Jon Loeliger2007-07-04-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
* | Coding style cleanup; update CHANGELOG.Wolfgang Denk2007-07-10-5/+4
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* | Merge with /home/hs/Atronic/u-bootWolfgang Denk2007-07-09-5/+137
|\ \ | |/ |/|
| * [PCS440EP] upgrade the PCS440EP board:Heiko Schocher2007-06-22-5/+137
| | | | | | | | | | | | | | | | | | | | | | | | - Show on the Status LEDs, some States of the board. - Get the MAC addresses from the EEProm - use PREBOOT - use the CF on the board. - check the U-Boot image in the Flash with a SHA1 checksum. - use dynamic TLB entries generation for the SDRAM Signed-off-by: Heiko Schocher <hs@denx.de>
* | Fix compilation issues on MACOSXAubrey.Li2007-05-15-3/+3
|/ | | | | Singed-off-by: Marc Hoffman <Marc.Hoffman@analog.com> Signed-off-by: Aubrey Li <aubrey.adi@gmail.com>
* Merge with /home/wd/git/u-boot/masterWolfgang Denk2006-10-11-110/+144
|\
| * Define IH_CPU_AVR32Stefan Roese2006-10-09-0/+1
| | | | | | | | | | | | Make it possible to generate AVR32 uImage files with mkimage and make cmd_bootm recognize them. Patch by Haavard Skinnemoen, 22 Sep 2006
| * Coding style cleanupWolfgang Denk2006-10-09-2/+2
| |
| * Fix mkimage -l bug with multifile images on 64bit platformsWolfgang Denk2006-09-06-1/+1
| | | | | | | | Patch by David Updegraff, 06 Sep 2006
| * Add support for a saving build objects in a separate directory.Marian Balakowicz2006-09-01-102/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifications are based on the linux kernel approach and support two use cases: 1) Add O= to the make command line 'make O=/tmp/build all' 2) Set environement variable BUILD_DIR to point to the desired location 'export BUILD_DIR=/tmp/build' 'make' The second approach can also be used with a MAKEALL script 'export BUILD_DIR=/tmp/build' './MAKEALL' Command line 'O=' setting overrides BUILD_DIR environent variable. When none of the above methods is used the local build is performed and the object files are placed in the source directory.
| * Fix tools/updater build error.Marian Balakowicz2006-09-01-6/+2
| |
| * tools/easylogo/easylogo.cMarian Balakowicz2006-09-01-1/+1
| |
* | * Support for FDT in uImage format, error when using FDT from flashMatthew McClintock2006-08-16-0/+1
|/ | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
* Fixed handling of bad checksums with "mkimage -l"Wolfgang Denk2006-04-28-5/+8
|