summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
| | * [new uImage] Compilation and new uImage handling fixes for imxtractBartlomiej Sieka2008-03-20-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix imxtract command not being compiled-in despite CONFIG_CMD_XIMG being in include/config_cmd_default.h. Fix few warnings and handling of new format images. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * [new uImage] Fix autoscr command used with new uImage formatBartlomiej Sieka2008-03-20-2/+7
| | | | | | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * [new uImage] Fix *.its files location in documentationBartlomiej Sieka2008-03-20-10/+11
| | | | | | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * [new uImage] Fix style issue spotted by Wolfgang Denk <wd@denx.org>Bartlomiej Sieka2008-03-19-11/+7
| | | | | | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * Add MD5 support to the new uImage formatBartlomiej Sieka2008-03-14-5/+16
| | | | | | | | | | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * Add the MD5 algorithmBartlomiej Sieka2008-03-14-0/+298
| | | | | | | | | | | | | | | | | | | | | MD5 supoprt is turned on by defining CONFIG_MD5, the digest can be then calculated using the md5() function -- see include/md5.h for details. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * Merge branch 'master' of git://www.denx.de/git/u-boot into new-imageMarian Balakowicz2008-03-12-785/+1975
| | |\
| | * | [new uImage] Fix build issue on ARMMarian Balakowicz2008-03-12-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | ARM platforms don't have a bd->bi_memsize so use bd->bi_dram[0].size instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | [new uImage] Add new uImage format documentation and examplesMarian Balakowicz2008-03-12-4/+981
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create doc/uImage.FIT documentation directory with the following files: - command_syntax_extensions.txt : extended command syntax description - howto.txt : short usage howto - source_file_format.txt : internal new uImage format description Add example image source files: - kernel.its - kernel_fdt.its - multi.its Update README appropriately. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| | * | [new uImage] Fix definition of common bootm_headers_t fieldsMarian Balakowicz2008-03-12-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | verify, autostart and lmb fields are used regardless of CONFIG_FIT setting, move their definitions to common section. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Fix build problems on trab boardMarian Balakowicz2008-03-12-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add proper ramdisk/FDT handling when FIT configuration is usedMarian Balakowicz2008-03-12-64/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save FIT configuration provied in the first bootm argument and use it when to get ramdisk/FDT subimages when second and third (ramdisk/FDT) arguments are not specified. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] More verbose kernel image uncompress error messageMarian Balakowicz2008-03-12-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Use show_boot_progress() for new uImage formatMarian Balakowicz2008-03-12-24/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allocates a set of show_boot_progress() IDs for new uImage format and adds show_boot_progress() calls in new uImage format handling code. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage fromat support to fpga commandMarian Balakowicz2008-03-12-9/+76
| | | | | | | | | | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format handling to other bootm related commandsMarian Balakowicz2008-03-12-64/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated commands: docboot - cmd_doc.c fdcboot - cmd_fdc.c diskboot - cmd_ide.c nboot - cmd_nand.c scsiboot - cmd_scsi.c usbboot - cmd_usb.c Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format support to imgextract commandMarian Balakowicz2008-03-12-31/+78
| | | | | | | | | | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format support to autoscript routineMarian Balakowicz2008-03-12-22/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autoscript() routine is updated to accept second argument, which is only used for FIT images and provides a FIT subimage unit name. autoscript() routine callers must now pass two arguments. For non-interactive use (like in cmd_load.c, cmd_net.c), new environment variable 'autoscript_uname' is introduced and used as a FIT subimage unit name source. autoscript command accepts extended syntax of the addr argument: addr:<subimg_uname> Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format support to arch specific do_bootm_linux() ↵Marian Balakowicz2008-03-12-36/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routines This patch updates architecture specific implementations of do_bootm_linux() adding new uImage format handling for operations like get kernel entry point address, get kernel image data start address. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add node offsets for FIT images listed in struct bootm_headersMarian Balakowicz2008-03-12-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds new node offset fields to struct bootm_headers and updates bootm_headers processing code to make use of them. Saved node offsets allow to avoid repeating fit_image_get_node() calls. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] ppc: Add new uImage format support to FDT handling routinesMarian Balakowicz2008-03-12-23/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for new (FIT) format uImages is added to powerpc specific boot_get_fdt() routine which now recognizes, sanity checks FIT image and is able to access data sections of the requested component image. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Re-enable interrupts for non automatic bootingMarian Balakowicz2008-03-12-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable interrupts if we return from do_bootm_<os> and 'autostart' environment variable is not set to 'yes'. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Remove unnecessary arguments passed to ramdisk routinesMarian Balakowicz2008-03-12-37/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | boot_get_ramdisk() and image_get_ramdisk() do not need all cmdtp, flag, argc and argv arguments. Simplify routines definition. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format support for ramdisk handlingMarian Balakowicz2008-03-12-16/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates boot_get_ramdisk() routine adding format verification and handling for new (FIT) uImages. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format support for kernel bootingMarian Balakowicz2008-03-12-11/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New format uImages are recognized by the bootm command, validity of specified kernel component image is checked and its data section located and used for further processing (uncompress, load, etc.) Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add new uImage format support for imls and iminfo commandsMarian Balakowicz2008-03-11-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | imls and iminfo can now recognize nad print out contents of the new (FIT) format uImages. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Add support for new uImage format to mkimage toolBartlomiej Sieka2008-03-11-56/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Make node unit names const in struct bootm_headersMarian Balakowicz2008-03-10-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] New uImage low-level APIMarian Balakowicz2008-03-10-6/+1420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Fix FDT blob totalsize calculation in boot_relocate_fdt()Marian Balakowicz2008-02-29-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use global fdt blob pointer, calculate blob size from routine argument blob pointer. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | libfdt: Add and use a node iteration helper function.David Gibson2008-02-29-174/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds an fdt_next_node() function which can be used to iterate through nodes of the tree while keeping track of depth. This function is used to simplify the iteration code in a lot of other functions, and is also exported for use by library users. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| | * | [new uImage] Add libfdt support to mkimageBartlomiej Sieka2008-02-29-3/+111
| | | | | | | | | | | | | | | | 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] Fix component handling for legacy multi component imagesMarian Balakowicz2008-02-29-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use uint32_t when accessing size table in image_multi_count() and image_multi_getimg() for multi component images. Add missing uimage_to_cpu() endianness conversion. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | [new uImage] Share common uImage code between mkimage and U-bootMarian Balakowicz2008-02-29-339/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-312/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-289/+833
| | |\ \
| | * | | [new uImage] Respect autostart setting in linux bootmKumar Gala2008-02-29-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] Provide ability to restrict region used for boot imagesKumar Gala2008-02-29-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the user to set 'bootm_low' and 'bootm_size' env vars as a way to restrict what memory range is used for bootm. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] Use lmb for bootm allocationsKumar Gala2008-02-29-126/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert generic ramdisk_high(), get_boot_cmdline(), get_boot_kbd() functions over to using lmb for allocation of the ramdisk, command line and kernel bd info. Convert PPC specific fdt_relocate() to use lmb for allocation of the device tree. Provided a weak function that board code can call to do additional lmb reserves if needed. Also introduce the concept of bootmap_base to specify the offset in physical memory that the bootmap is located at. This is used for allocations of the cmdline, kernel bd, and device tree as they should be contained within bootmap_base and bootmap_base + CFG_BOOTMAPSZ. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | | [new uImage] Add autostart flag to bootm_headers structureKumar Gala2008-02-29-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autostart env variable was dropped as part of the initial new uImage cleanup. Add it back here so the arch specific code can decide if it wants to really boot or not. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] Introduce lmb from linux kernel for memory mgmt of boot imagesKumar Gala2008-02-29-0/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the LMB lib used on PPC in the kernel as a clean way to manage the memory spaces used by various boot images and structures. This code will allow us to simplify the code in bootm and its support functions. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | | [new uImage] ppc: Allow boards to specify effective amount of memoryKumar Gala2008-02-29-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons we limited the stack to 256M because some boards could only map that much via BATS. However newer boards are capable of mapping more memory (for example 85xx is capable of doing up to 2G). Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] rework error handling so common functions don't resetKumar Gala2008-02-29-32/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed image_get_ramdisk() to just return NULL on error and have get_ramdisk() propogate that error to the caller. It's left to the caller to call do_reset() if it wants to. Also moved calling do_reset() in get_fdt() and fdt_relocate() on ppc to a common location. In the future we will change get_fdt() and fdt_relocate() to return success/failure and not call do_reset() at all. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] ppc: Re-order ramdisk/fdt handling sequenceKumar Gala2008-02-29-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing the fdt before the ramdisk allows us to grow the fdt w/o concern however it does mean we have to go in and fixup the initrd info since we don't know where it will be. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| | * | | [new uImage] ppc: Determine if we are booting an OF styleKumar Gala2008-02-29-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we are bootin OF style than we can skip setting up some things that are used for the old boot method. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] Don't pass kdb to ramdisk_high since we may not have oneKumar Gala2008-02-29-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need the kdb param as we are just using it to get bd->bi_memsize which we can get from gd->bd->bi_memsize. Also, if we boot via OF we might not actually fill out a kdb. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] Correct raw FDT blob handlig when CONFIG_FIT is disabledMarian Balakowicz2008-02-27-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dual format image code must properly handle all three FDT passing methods: - raw FDT blob passed - FDT blob embedded in the legacy uImage - FDT blob embedded in the new uImage This patch enables proper raw FDT handling when no FIT imaeg support is compiled in. This is a bit tricky as we must dected FIT format even when FIT uImage handling is not enabled as both FIT uImages and raw FDT blobs use tha same low level format (libfdt). Signed-off-by: Marian Balakowicz <m8@semihalf.com>
| | * | | [new uImage] POWERPC: Add image_get_fdt() routineMarian Balakowicz2008-02-27-32/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FDT blob may be passed either: (1) raw (2) or embedded in the legacy uImage (3) or embedded in the new uImage. For the (2) case embedding image must be verified before we get FDT from it. This patch factors out legacy image specific verification routine to the separate helper routine. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Acked-by: Kumar Gala <galak@kernel.crashing.org>
| | * | | [new uImage] Add image_get_kernel() routineMarian Balakowicz2008-02-27-33/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy image specific verification is factored out to a separate helper routine to keep get_kernel() generic and simple. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Acked-by: Kumar Gala <galak@kernel.crashing.org>