summaryrefslogtreecommitdiff
path: root/tools/mkenvimage.c
Commit message (Collapse)AuthorAgeLines
* mkenvimage: Fix compiler warningDirk Behme2012-04-10-2/+2
| | | | | | | | | | | | | | | | | | | | Fix the compiler warning mkenvimage.c: In function ‘main’: mkenvimage.c:218: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ mkenvimage.c:226: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ introduced with the commit mkenvimage: Use mmap() when reading from a regular file 6ee39f8055680654f9cc97b98dcce9588f1ab71e Signed-off-by: Dirk Behme <dirk.behme@googlemail.com> CC: David Wagner <david.wagner@free-electrons.com> CC: Anatolij Gustschin <agust@denx.de> CC: Mike Frysinger <vapier@gentoo.org> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: David Wagner <deubeuliou@gmail.com>
* mkenvimage: Really set the redundant byte when applicableDavid Wagner2012-03-27-1/+3
| | | | | Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: Don't try to detect comments in the input fileDavid Wagner2012-03-27-8/+0
| | | | | | | Remove this feature since it seems impossible to reliably detect them. Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: Use mmap() when reading from a regular fileDavid Wagner2012-03-27-6/+19
| | | | | | | Fall back to read() if it fails. Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: Read/Write from/to stdin/out by default or if the filename is "-"David Wagner2012-03-27-13/+13
| | | | | Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: More error handlingDavid Wagner2012-03-27-2/+29
| | | | | | | | | | Verbosly fail if the target environment size or the padding byte are badly formated. Verbosly fail if something bad happens when reading from standard input. Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: Correct an include and add a missing oneDavid Wagner2012-03-27-1/+2
| | | | | | | | | | compiler.h needs to be included from U-Boot's headers. Also, group U-Boot-specific includes together stdlib.h was missing. Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: correct and clarify comments and error messagesDavid Wagner2012-03-27-25/+14
| | | | | | | | Also, don't split error messages over several lines as per a coding style exception making them easier to grep. Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* mkenvimage: fix usage messageWolfgang Denk2012-03-26-1/+1
| | | | | | | | | Don't use argv[0] for usage() because it may or may not be clobbered by the previous call to basename(). Use "prg" instead as it is done in the rest of the code. Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
* Correctly handle input files beginning with several newlinesDavid Wagner2012-01-05-5/+5
| | | | | | Also, fix some comments (minor) Signed-off-by: David Wagner <david.wagner@free-electrons.com>
* tools/mkenvimage.c: Fix a merge issueHorst Kronstorfer2012-01-05-2/+2
| | | | | | With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted. Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
* Merge branch 'next' of ../nextWolfgang Denk2011-12-23-5/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'next' of ../next: mkenvimage: Add version info switch (-V) mkenvimage: Fix getopt() error handling mkenvimage: Fix some typos phy: add Micrel KS8721BL phy definition net: introduce per device index mvgbe: remove setting of ethaddr within the driver x86: Add support for specifying an initrd with the zboot command x86: Refactor the zboot innards so they can be reused with a vboot image x86: Add infrastructure to extract an e820 table from the coreboot tables x86: Add support for booting Linux using the 32 bit boot protocol x86: Clean up the x86 zimage code in preparation to extend it x86: Import code from coreboot's libpayload to parse the coreboot table x86: Initial commit for running as a coreboot payload CHECKPATCH: ./board/esd/hh405/logo_320_240_8bpp.c CHECKPATCH: ./board/esd/hh405/logo_1024_768_8bpp.c CHECKPATCH: ./board/esd/hh405/logo_320_240_4bpp.c CHECKPATCH: ./board/esd/hh405/logo_640_480_24bpp.c CHECKPATCH: ./board/esd/apc405/logo_640_480_24bpp.c CHECKPATCH: ./board/esd/voh405/logo_320_240_4bpp.c CHECKPATCH: ./board/esd/voh405/logo_640_480_24bpp.c CHECKPATCH: ./board/esd/hh405/fpgadata.c CHECKPATCH: ./board/esd/pci405/fpgadata.c CHECKPATCH: ./board/esd/tasreg/fpgadata.c CHECKPATCH: ./board/esd/apc405/fpgadata.c CHECKPATCH: ./board/esd/voh405/fpgadata.c CHECKPATCH: ./board/esd/ash405/fpgadata.c CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c CHECKPATCH: ./board/esd/ar405/fpgadata.c CHECKPATCH: ./board/esd/plu405/fpgadata.c CHECKPATCH: ./board/esd/wuh405/fpgadata.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c CHECKPATCH: ./board/esd/canbt/fpgadata.c CHECKPATCH: ./board/esd/du405/fpgadata.c CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c avr32:mmu.c: fix printf() length modifier fat.c: fix printf() length modifier cmd_sf.c: fix printf() length modifier Make printf and vprintf safe from buffer overruns vsprintf: Move function documentation into header file Add safe vsnprintf and snprintf library functions Move vsprintf functions into their own header Conflicts: tools/mkenvimage.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * mkenvimage: Add version info switch (-V)Horst Kronstorfer2011-12-20-1/+6
| | | | | | | | Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
| * mkenvimage: Fix getopt() error handlingHorst Kronstorfer2011-12-20-2/+10
| | | | | | | | | | | | | | | | | | Since the original implementation indicates explicit error handling we turn off getopt()'s internal error messaging to avoid duplicate error messages. Additionally we add ':' (missing option argument) error handling. Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
| * mkenvimage: Fix some typosHorst Kronstorfer2011-12-20-4/+4
| | | | | | | | Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
* | Print program basename instead of whole path in usage()Horst Kronstorfer2011-12-22-3/+9
|/ | | | Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
* new tool mkenvimage: generates an env image from an arbitrary config fileDavid Wagner2011-11-22-0/+270
This tool takes a key=value configuration file (same as would a `printenv' show) and generates the corresponding environment image, ready to be flashed. use case: flash the environment with an external tool Signed-off-by: David Wagner <david.wagner@free-electrons.com> Acked-by; Mike Frysinger <vapier@gentoo.org> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
generated by cgit v1.1 at 2024-11-14 21:11:09 +0000