summaryrefslogtreecommitdiffstats
path: root/commands/bootm.c
Commit message (Collapse)AuthorAgeFilesLines
...
* commands: remove struct command pointer from commandsSascha Hauer2012-02-271-1/+1
| | | | | | This is unused in all commands and thus can be removed. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* uimage: Fix error messageSascha Hauer2012-02-131-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'work/uimage' into nextSascha Hauer2011-12-171-125/+326
|\ | | | | | | | | | | | | | | | | Conflicts: arch/ppc/lib/ppclinux.c commands/bootm.c include/boot.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * bootm: use new uimage codeSascha Hauer2011-12-151-125/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the bootm code to the new uimage code. Also bootm can now handle other types of images than uImages. Currently the only architecture making use of this is arm which allows to boot zImages, raw images and barebox images. I intended to make a more bisectable series from this but I failed becuase there are many dependencies and no matter how I tried the patches grew bigger and and bigger. So I decided to put this all in a single patch. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ppc: switch to libfdt based oftree implementationSascha Hauer2011-12-141-0/+5
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'pu/ppc-oftree' into nextSascha Hauer2011-12-151-0/+5
|\ \
| * | ppc: switch to libfdt based oftree implementationSascha Hauer2011-12-151-0/+5
| |/ | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* / remove unused watchdog headerSascha Hauer2011-12-151-1/+0
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: factor out initrd code from option parserSascha Hauer2011-12-071-11/+15
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: remove dead codeSascha Hauer2011-11-291-8/+0
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: use generic uncompress functionSascha Hauer2011-11-291-27/+4
| | | | | | | | | This simplifies the code somewhat. The user visible change here is that we now ignore the compression specified in the uImage. Instead we detect the compression type from the data which also means that we now support lzo compressed uImages. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: do not select uncompression methodsSascha Hauer2011-11-291-2/+2
| | | | | | | Instead, let the user select them manually so that bootm supports all compression types compiled in. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* add kernel gunzip implementationSascha Hauer2011-11-291-4/+6
| | | | | | | The kernel uncompression functions have a unified API so use this implementation to get it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* use kernel bunzip implementationSascha Hauer2011-11-291-11/+12
| | | | | | | | The kernel uncompression functions have a unified API. Switch to the kernel implementation to unify the different uncompression APIs. As a bonus the kernel implementation is much smaller. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: use initrd_address and initrd_sizeSascha Hauer2011-11-291-5/+6
| | | | | | Make these fields in struct image_data the reference for image handlers Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: push relocate_image up to the generic commandSascha Hauer2011-11-291-0/+17
| | | | | | | | | All handlers used to just relocate the image without any checks, so we are doomed if we write outside of SDRAM or will overwrite ourselves. Move the relocation up to the generic part where we have a chance of catching these issues. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm relocate_image: honour load_addressSascha Hauer2011-11-291-7/+7
| | | | | | | | | the uImage should be relocated to load_address. This is handled correctly in gzip/bzip2 compressed images, but not in uncompressed images. fix this. Also, when a variable is not used once without casting to another type it probably means that its type is wrong. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: fix typo, update help strSascha Hauer2011-11-291-2/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: do not require -L after -rSascha Hauer2011-11-291-8/+5
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: fix various memory leaksSascha Hauer2011-11-291-8/+11
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: remove image handler optionsSascha Hauer2011-11-291-54/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: handle initrds inlineSascha Hauer2011-11-291-50/+28
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* factor out iminfo commandSascha Hauer2011-11-291-79/+0
| | | | | | | | The rests of U-Boots iminfo command are sitting in commands/bootm.c and are in a nonusable state. Factor it out to its own file and make it work again. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: remove dead codeSascha Hauer2011-11-291-47/+0
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'work/magicvars' into nextSascha Hauer2011-11-291-0/+3
|\
| * bootm: Add bootargs magicvarSascha Hauer2011-11-291-0/+3
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | remove irq support fragmentsSascha Hauer2011-11-281-2/+0
|/ | | | | | | | We never had interrupt support in barebox and we have no plans to add interrupt support. Even if we do I doubt the current fragments of irq support are helpful, so remove them. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: add -L option to specify the initrd load addressJean-Christophe PLAGNIOL-VILLARD2011-10-091-3/+17
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* get_fake_image_handle: set nb_data_entries to 1 and update the header sizeJean-Christophe PLAGNIOL-VILLARD2011-10-091-0/+2
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* bootm: ensure the uImage is mapped first to allow option to used itJean-Christophe PLAGNIOL-VILLARD2011-10-091-4/+16
| | | | | | | needed for multi image support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* image: move map_image amd unmap_image to image.cJean-Christophe PLAGNIOL-VILLARD2011-09-281-114/+0
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* image: add multi image support for bootmJean-Christophe PLAGNIOL-VILLARD2011-09-281-2/+76
| | | | | | | you can choose the initrd via @<num> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* image: use data base addr for image_print_contents, image_multi_count/getimgJean-Christophe PLAGNIOL-VILLARD2011-09-281-1/+1
| | | | | | | | as in barebox the data could be the mapped file or a allocated memory with just the data (non header) Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* commands/bootm.c: fix unused-but-set-variable gcc warningAntony Pavlov2011-07-041-2/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Remove m68k supportSascha Hauer2010-11-171-1/+0
| | | | | | | | | The m68k support is compile broken for a long time now and nobody cared so far. We cannot keep the architecture uptodate with current development wihtout being able to compile it. It's still in the archives and can be re-added anytime once somebody cares for. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* doc: add documentation for 'bootm'Robert Schwebel2010-11-011-15/+23
| | | | Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
* bootm: sparse fixesSascha Hauer2010-10-211-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* image: remove confusing image_check_* functionsSascha Hauer2010-10-131-4/+4
| | | | | | | | | | | The function names do not make it clear what return value is expected and do not save a single line of code. Put the code inline and unbreak the wrong checks introduced with a3c1e5d888d0ee317ffc7635694684bb71213c9c. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Eric Bénard <eric@eukrea.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* image: factorise image printing contentsJean-Christophe PLAGNIOL-VILLARD2010-10-081-45/+1
| | | | | | Copied from U-Boot Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Replace direct header access with the API routinesJean-Christophe PLAGNIOL-VILLARD2010-10-081-37/+42
| | | | | | Copied from U-Boot Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* image: rename IH_CPU to IH_ARCH to be more concistantJean-Christophe PLAGNIOL-VILLARD2010-10-081-1/+1
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* image: factorise string helperJean-Christophe PLAGNIOL-VILLARD2010-10-081-88/+5
| | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* Revert "image: factorise string helper"Sascha Hauer2010-10-071-5/+88
| | | | This reverts commit 7bd7d59e60f3f23862ebc09c9f3527ee24b2960f.
* Revert "image: rename IH_CPU to IH_ARCH to be more concistant"Sascha Hauer2010-10-071-1/+1
| | | | | | | | | | This reverts commit aba80a2d2d0f1b25185246925577ce2108247dde. Conflicts: include/image.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Revert "Replace direct header access with the API routines"Sascha Hauer2010-10-071-42/+37
| | | | | | | | | | This reverts commit 0ceafe14be072696eff3e549d8c7b7de8a3e416d. Conflicts: include/image.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Revert "image: factorise image printing contents"Sascha Hauer2010-10-071-1/+45
| | | | This reverts commit d424ce77f5e9295584252452dbd78eea562c9af0.
* image: factorise image printing contentsJean-Christophe PLAGNIOL-VILLARD2010-09-241-45/+1
| | | | | | | before we duplicate it between command/bootm.c and scripts/mkimage.c Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Replace direct header access with the API routinesJean-Christophe PLAGNIOL-VILLARD2010-09-241-37/+42
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* image: rename IH_CPU to IH_ARCH to be more concistantJean-Christophe PLAGNIOL-VILLARD2010-09-231-1/+1
| | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* image: factorise string helperJean-Christophe PLAGNIOL-VILLARD2010-09-231-88/+5
| | | | | | | before we duplicate it between common/bootm.c and scripts/mkimage.c Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 12:51:51 +0000