summaryrefslogtreecommitdiff
path: root/tools
AgeCommit message (Collapse)Author
2009-12-07Merge branch 'master' of ../work into nextWolfgang Denk
2009-12-07tools/mkimage: Remove duplicate line of codePeter Tyser
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>
2009-12-05Merge branch 'master' into nextWolfgang Denk
Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-12-05tools/mkimage: Print FIT image contents after creationPeter Tyser
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>
2009-12-05tools/fit_image.c: Remove unused fit_set_header()Peter Tyser
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>
2009-12-05tools/mkimage: Assume FDT image type for FIT imagesPeter Tyser
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>
2009-12-02makefiles: fixes for building build toolsScott Wood
Currently, some of the tools instead set CC to be HOSTCC in order to re-use some pattern rules -- but this fails when the user overrides CC on the make command line. Also, the HOSTCFLAGS in tools/Makefile are currently not being used because config.mk overwrites them. This patch adds static pattern rules for files that have been requested to be built with the native compiler using $(HOSTSRCS) and $(HOSTOBJS), and converts the tools to use them. It restores easylogo to using the host compiler, which was broken by commit 38d299c2db81bd889c601b5dfc12c4e83ef83333 (if this was an intentional change, please let me know -- but it seems to be a build tool). It restores -pedantic and the special flags for darwin and cygwin that were requested in tools/makefile (but keeps the flags added by config.mk) -- hopefully someone can test this on those platforms. It no longer conditionalizes -pedantic on not being darwin; it wasn't clear that that was intentional, and unless there's a real problem it's just inviting people to contribute non-pedantic patches to those files (I'm not a fan of -pedantic personally, but if it's on for one platform it should be on for all). HOST_LDFLAGS is renamed HOSTLDFLAGS for consistency with the previous HOST_CFLAGS to HOSTCFLAGS rename. A new HOSTCFLAGS_NOPED is made available for those files which currently cannot be built with -pedantic, and replaces the old FIT_CFLAGS. imls now uses the cross compiler properly, rather than by trying to reconstruct CC using the typoed $(CROSS_COMPILER). envcrc.c is now dependency-processed unconditionally -- previously it would be built without being on (HOST)SRCS if CONFIG_ENV_IS_EMBEDDED was not selected. Signed-off-by: Scott Wood <scottwood@freescale.com>
2009-11-24img2srec: use standard typesMike Frysinger
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>
2009-11-24tools: gitignore *.exe binariesMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-11-23Fix mingw tools buildRemy Bohmer
mkimage does not build due to missing strtok_r() and getline() implementation Signed-off-by: Remy Bohmer <linux@bohmer.net>
2009-11-23Building of FIT images does not work.Remy Bohmer
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>
2009-10-27Revert "env: only build env_embedded and envcrc when needed"Wolfgang Denk
Breaks building on many boards, and no really clean fix available yet. This reverts commit 6dab6add2d8ee80905234b326abc3de11be1d178.
2009-10-19envcrc: check return value of fwrite()Mike Frysinger
Newer toolchains will often complain about unchecked fwrite(): envcrc.c:117: warning: ignoring return value of `fwrite´, declared with attribute warn_unused_result So check the return value to silence the warnings. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-10-18env: only build env_embedded and envcrc when neededMike Frysinger
The env code is protected by the ENV_IS_EMBEDDED define, so attempting to compile the code when this isn't defined is pointless. Now that the env headers have unified around CONFIG_ENV_IS_EMBEDDED, convert the build system to only build the env objects when this is enabled. And now that the env code is conditionally compiled, we can drop the source code checks. For people who want to extract the environment manually, add a new option CONFIG_BUILD_ENVCRC that only enables the envcrc utility. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-09-18Merge branch 'warning-cleanup'Wolfgang Denk
2009-09-15tools/netconsole: use ncb automatically if availableMike Frysinger
The standard netcat, while ubiquitous, doesn't handle broadcast udp packets properly. The local ncb util does however. So if ncb can be located in the standard locations, automatically use that instead. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-09-15tools/netconsole: make a bit more robustMike Frysinger
The netcat utility likes to exit when it receives an empty packet (as it thinks this means EOF). This can easily occur when working with command line editing as this behavior will be triggered when using backspace. Or with tabs and command line completion. So create two netcat processes - one to only listen (and put it into a loop), and one to do the sending. Once the user quits the transmitting netcat, the listening one will be killed automatically. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-09-15kwbimage.c: Fix compile warning when building on 64 bit systems (again)Wolfgang Denk
Commit 51003b89 attempted to fix a build problem on 64 bit systems, but just turned it into a build problem on 32 bit systems (silly me). Now do the Right Thing (TM) and use a "%zu" printf format. Also fix spelling error. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-11kwbimage.c: Fix compile warning when building on 64 bit systemsWolfgang Denk
Fix this warning when building on 64 bit systems: tools/kwbimage.c: In function 'kwbimage_checksum32': tools/kwbimage.c:135: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Prafulla Wadaskar <prafulla@marvell.com>
2009-09-10mkimage: Add Kirkwood Boot Image support (kwbimage)Prafulla Wadaskar
This patch adds support for "kwbimage" (Kirkwood Boot Image) image types to the mkimage code. For details refer to docs/README.kwbimage This patch is tested with Sheevaplug board Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Ron Lee <ron@debian.org> Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2009-09-10mkimage: Include missing files in build dependency calculationsPrafulla Wadaskar
Include default_image.o and fit_image.o into the build dependency calculations. This makes sure they get rebuilt if any of the headers they include are modified Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Ron Lee <ron@debian.org> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-10tools/mkimage: fix compiler warnings, use "const"Wolfgang Denk
This fixes some compiler warnings: tools/default_image.c:141: warning: initialization from incompatible pointer type tools/fit_image.c:202: warning: initialization from incompatible pointer type and changes to code to use "const" attributes in a few places where it's appropriate. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-10tools: mkimage: split code into core, default and FIT image specificPrafulla Wadaskar
This is a first step towards reorganizing the mkimage code to make it easier to add support for additional images types. Current mkimage code is specific to generating uImage and FIT image files, but the same framework can be used to generate other image types like Kirkwood boot images (kwbimage-TBD). For this, the mkimage code gets reworked: Here is the brief plan for the same:- a) Split mkimage code into core and image specific support b) Implement callback functions for image specific code c) Move image type specific code to respective C files Currently there are two types of file generation/list supported (i.e uImage, FIT), the code is abstracted from mkimage.c/.h and put in default_image.c and fit_image.c; all code in these file is static except init function call d) mkimage_register API is added to add new image type support All above is addressed in this patch e) Add kwbimage type support to this new framework (TBD) This will be implemented in a following commit. Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Edit commit message, fix coding style and typos. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-10tools: mkimage: Fixed build warningsPrafulla Wadaskar
uninitialized retval variable warning fixed crc32 APIs moved to crc.h (newly added) and build warnings fixed Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-10tools: mkimage: Makefile sortedPrafulla Wadaskar
The tools/Makefile is sorted for all entries, Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
2009-09-10tools: mkimage : bugfix returns correct value for list commandPrafulla Wadaskar
List command always return "EXIT_SUCCESS" even in case of failure by any means. This patch return 0 if list command is sucessful, returns negative value reported by check_header functions Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-09-04License cleanup: remove unintended "All Rights Reserved" notices.Wolfgang Denk
Some files included my old standerd file header which had a "All Rights Reserved" part. As this has never been my intention, I remove these lines to make the files compatible with GPL v.2 and later. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-07-23unify HOST_CFLAGS and HOSTCFLAGSMike Frysinger
The top build system sets up HOSTCFLAGS a bit and exports it, but other places use HOST_CFLAGS instead. Unify the two as HOSTCFLAGS so that the values stay in sync. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-07-19compiler.h: unify system ifdef cruft hereMike Frysinger
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>
2009-07-17envcrc: add missing dependencies on env storageMike Frysinger
When the envcrc building was made conditional, it missed a bunch of env storage types, so add all currently supported types. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-06-15Blackfin: add jtagconsole helper scriptMike Frysinger
This script is similar to the netconsole script, but instead works with the JTAG console device driver that exists on Blackfin parts. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-06-12tools/envcrc: add --binary option to export embedded envMike Frysinger
The --binary option to envcrc can be used to export the embedded env as a binary blob so that it can be manipulated/examined/whatever externally. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-05-15Add imls utility commandMarco Stornelli
This patch adds, under tools folder, a new command called imls. Its goal is the same of UBoot's imls but it can be used as Linux shell command. It reads from raw mtd partition and prints the list of the stored images. Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
2009-04-27bmp_logo: Check return value of fread()Peter Tyser
Add basic error handling to fread() function calls. This prevents compililation warnings such as: bmp_logo.c: In function ‘main’: bmp_logo.c:71: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result ... Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-27ncb: Check return value of write()Peter Tyser
This prevents the compilation warning: ncb.c: In function 'main': ncb.c:32: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-27Replace __asm references with __asm__Peter Tyser
__asm__ follows gcc's documented syntax and is generally more common than __asm. This change is only asthetic and should not affect functionality. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-16at91: add support for the PM9263 board of Ronetix GmbHIlko Iliev
The PM9263 board is based on the AT91SAM9263-EK board. Here is the page on Ronetix website: http://www.ronetix.at/starter_kit_9263.html Signed-off-by: Ilko Iliev <iliev@ronetix.at> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2009-04-04One more fix for building env_embedded.oWolfgang Denk
In addition to the changes for CONFIG_ENV_IS_IN_FLASH as done in commit afcbce07, we also need to do the same for CONFIG_ENV_IS_IN_EEPROM and CONFIG_ENV_IS_IN_NVRAM. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-04-04tools/setlocalversion: use git svn instead of git-svnPeter Korsgaard
Use the new "git <subcmd>" syntax instead of the deprecated "git-<subcmd>". Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-04-04Fix implicit declaration of function 'htons'Wolfgang Denk
Include <netinet/in.h> instead of <linux/in.h> to get htons() prototpye. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-04-04Fix building of env_embedded.oWolfgang Denk
Since commit a706bfc7 common/env_embedded.o and tools/envcrc were only built when CONFIG_ENV_IS_EMBEDDED was set, but this breaks building for many boards. We always have to build these files when CONFIG_ENV_IS_IN_FLASH is set. Signed-off-by: Wolfgang Denk <wd@denx.de>
2009-04-04tools/Makefile: fix image.c dependancy locationJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-04-04tools: add ncb to gitignoreMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-04-03Delete now unused tools/Makefile.win32Peter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-03Add support for building native win32 toolsPeter Tyser
Add support for compiling the host tools in the tools directory using the MinGW toolchain. This produces executables which can be used on standard Windows computers without requiring cygwin. One must specify the MinGW compiler and strip utilities as if they were the host toolchain in order to build win32 executables, eg: make HOSTCC=i586-mingw32msvc-gcc HOSTSTRIP=i586-mingw32msvc-strip tools Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-03tools/Makefile: Simplify HOST_CFLAGS/HOST_LDFLAGS generationPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-03tools/Makefile: Create generic build rulesPeter Tyser
Create a few generic build rules to replace the current method which has 1 build target for each file Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-03tools/Makefile: Use auto-generated object file dependenciesPeter Tyser
Files in the SRCS variable have their dependencies automatically generated so remove duplicate explicit dependencies Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-03tools/Makefile: Remove symlinks for remaining source filesPeter Tyser
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2009-04-03tools/Makefile: Dynamically generate libfdt object dependenciesPeter Tyser
Add the libfdt files to the SRCS variable so that they have their dependencies automatically generated Signed-off-by: Peter Tyser <ptyser@xes-inc.com>