summaryrefslogtreecommitdiffstats
path: root/common
Commit message (Collapse)AuthorAgeFilesLines
* [new uImage] Update naming convention for bootm/uImage related codeMarian Balakowicz2008-02-2911-242/+249
| | | | | | | | | | | | | | | 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-291-4/+6
|\
| * ENV: remove saveenv when CFG_ENV_IS_NOWHERE is selectedJean-Christophe PLAGNIOL-VILLARD2008-02-231-4/+6
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* | [new uImage] Provide ability to restrict region used for boot imagesKumar Gala2008-02-292-5/+31
| | | | | | | | | | | | | | | | 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-292-87/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-0/+7
| | | | | | | | | | | | | | | | | | 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-291-0/+14
| | | | | | | | | | | | | | | | 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] rework error handling so common functions don't resetKumar Gala2008-02-291-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | 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] Don't pass kdb to ramdisk_high since we may not have oneKumar Gala2008-02-291-5/+4
| | | | | | | | | | | | | | | | | | 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-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add image_get_kernel() routineMarian Balakowicz2008-02-271-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>
* | [new uImage] Move image verify flag to bootm_headers structureMarian Balakowicz2008-02-272-31/+29
| | | | | | | | | | | | | | | | | | | | Do not pass image verification flag directly to related routines. Simplify argument passing and move it to the bootm_header structure which contains curently processed image specific data and is already being passed on the argument list. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Acked-by: Kumar Gala <galak@kernel.crashing.org>
* | [new uImage] Optimize gen_get_image() flow controlMarian Balakowicz2008-02-271-31/+33
| | | | | | | | | | | | | | | | When CONFIG_HAS_DATAFLASH is not defined gen_get_image() routine has nothing to do, update its control flow to better reflect that simple case. Signed-off-by: Marian Balakowicz <m8@semihalf.com> Acked-by: Kumar Gala <galak@kernel.crashing.org>
* | [new uImage] Add dual format uImage support frameworkMarian Balakowicz2008-02-2511-293/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds framework for dual format images. Format detection is added and the bootm controll flow is updated to include cases for new FIT format uImages. When the legacy (image_header based) format is detected appropriate legacy specific handling is invoked. For the new (FIT based) format uImages dual boot framework has a minial support, that will only print out a corresponding debug messages. Implementation of the FIT specific handling will be added in following patches. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | [new uImage] Fix erroneous use of image_get_magic() in fdc/usb cmdsMarian Balakowicz2008-02-212-2/+2
| | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | [new uImage] Rename and move print_image_hdr() routineMarian Balakowicz2008-02-219-67/+66
| | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | [new uImage] Add fit_parse_conf() and fit_parse_subimage() routinesMarian Balakowicz2008-02-211-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introducing routines for parsing new uImage format bootm arguments: [<addr>]#<conf> - configuration specification [<addr>]:<subimg> - subimage specification New format images can contain multiple subimages of the same type. For example a single new format image file can contain three kernels, two ramdisks and a couple of FDT blobs. Subimage and configuration specifications are extensions to bootm (and other image-related commands) arguments' syntax that allow to specify which particular subimage should be operated on. Subimage specification is used to denote a particular subimage. Configurations are a bit more complex -- they are used to define a particualr booting setup, for example a (kernel, fdt blob) pair, or a (kernel, ramdisk, fdt blob) tuple, etc. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | [new uImage] Add gen_get_image() routineMarian Balakowicz2008-02-212-40/+108
| | | | | | | | | | | | | | | | | | This routine assures that image (whether legacy or FIT) is not in a special dataflash storage. If image address is a dataflash address image is moved to system RAM. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | Merge branch 'master' of /home/git/u-bootMarian Balakowicz2008-02-2110-107/+377
|\ \ | |/
| * Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-151-8/+9
| |\
| | * AT91CAP9 supportStelian Pop2008-02-141-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | --------------------------------- read_dataflash() takes a signed char pointer as a parameter. Silence a few warnings dues to incorrect parameter types in env_dataflash.c. Signed-off-by: Stelian Pop <stelian@popies.net>
| * | Fix wrong memory limit calculation in memory-testGuennadi Liakhovetski2008-02-151-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the length of the memory address range passed to the "mtest" command is not of the form 2^x - 1, not all address lines are tested. This bug is inherited from the original software at http://www.netrino.com/Embedded-Systems/How-To/Memory-Test-Suite-C. Fix this. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
| * | Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xxWolfgang Denk2008-02-151-1/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: common/cmd_reginfo.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * \ Merge commit 'wd/master'Jon Loeliger2008-02-141-3/+3
| | |\ \ | | | |/
| | * | Merge commit 'wd/master'Jon Loeliger2008-02-134-49/+18
| | |\ \
| | * | | 86xx: Add reginfo commandBecky Bruce2008-01-241-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
| * | | | Merge branch 'master' of git://www.denx.de/git/u-boot-blackfinWolfgang Denk2008-02-157-8/+340
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile doc/README.standalone Signed-off-by: Wolfgang Denk <wd@denx.de>
| | * | | | new command for displaying strings at specified memory locationsMike Frysinger2008-02-042-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | | interface to Blackfin on-chip One-Time-Programmable memoryMike Frysinger2008-02-042-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | | add support for memory commands with Blackfin L1 instruction memoryMike Frysinger2008-02-041-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | | add Blackfin-specific reginfo commandMike Frysinger2008-02-041-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | | add Blackfin-specific bdinfo commandMike Frysinger2008-02-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| | * | | | fix building on Blackfin as the assembler supports the .set syntax, not the ↵Mike Frysinger2008-02-041-1/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | = syntax, for assigning symbols Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | | Fix return value of mtest when CFG_ALT_MEMTEST setGuennadi Liakhovetski2008-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a missing return statement from a non-void function. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
| * | | | common/miiphyutil.c: Cleanup MII_DEBUG and debug()Shinya Kuribayashi2008-02-141-22/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current MII_DEBUG is confusing in two ways. One is useless define-then- undef at the top of the file. The other is there is only one debug() in this file, and that doesn't seem worthwhile to bother having MII_DEBUG. While there are many useful printf()/puts() debug codes, but they are for DEBUG, not for MII_DEBUG. This patch tries to put them all together into MII_DEBUG and debug(). Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * | | Fix building of fdt_support.c if DEBUG setKumar Gala2008-02-131-3/+3
| | |/ | |/| | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | QE: Move FDT support into a common fileKumar Gala2008-02-121-48/+0
| | | | | | | | | | | | | | | | | | | | | Move the flat device tree setup for QE related devices into a common file shared between 83xx & 85xx platforms that have QE's. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | | [new uImage] Move kernel data find code to get_kernel() routineMarian Balakowicz2008-02-071-74/+107
| | | | | | | | | | | | | | | | | | | | | | | | Verification of the kernel image (in old format) and finding kernel data is moved to a dedicated routine. The routine will also hold support for, to be added, new image format. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Cleanup do_botm_linux() boot allocationsMarian Balakowicz2008-02-071-9/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves common pre-boot allocation steps shared between PPC and M68K to a helper routines: common: - get_boot_sp_limit() - get_boot_cmline() - get_boot_kbd() platform: - set_clocks_in_mhz() Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Move ramdisk loading to a common routineMarian Balakowicz2008-02-071-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ramdisk loading code, including initrd_high variable handling, was duplicated for PPC and M68K platforms. This patch creates common helper routine that is being called from both platform do_bootm_linux() routines. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Factor out common image_get_ramdisk() routineMarian Balakowicz2008-02-071-3/+200
| | | | | | | | | | | | | | | | | | | | | | | | Architecture specific do_bootm_linux() routines share common ramdisk image processing code. Move this code to a common helper routine. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Factor out common routines for getting os/arch/type/comp namesMarian Balakowicz2008-02-072-65/+100
| | | | | | | | | | | | | | | | | | | | | | | | Move numeric-id to name translation for image os/arch/type/comp header fields to a helper routines: image_get_os_name(), image_get_arch_name(), image_get_type_name(), image_get_comp_name(). Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Remove standalone applications handling from boootmMarian Balakowicz2008-02-071-37/+1
| | | | | | | | | | | | | | | | | | | | | Standalone applications are supposed to be run using the "go" command. This patch removes standalone images handling from the do_bootm(). Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Remove OF_FLAT_TREE support from PPC bootm codeMarian Balakowicz2008-02-071-9/+1
| | | | | | | | | | | | | | | | | | | | | Support for OF_FLAT_TREE is to be obsoleted in the near future, remove related code from the bootm routines. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Return error on image move/uncompress overwritesMarian Balakowicz2008-02-071-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check for overwrites during image move/uncompress, return with error when the original image gets corrupted. Report clear message to the user and prevent further troubles when pointer to the corrupted images is passed to do_bootm_linux routine. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Cleanup image header pointer use in bootm codeMarian Balakowicz2008-02-073-94/+155
| | | | | | | | | | | | | | | | | | | | | - use single image header pointer instead of a set of auxilliary variables. - add multi component image helper routines: get component size/data address Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Cleanup cmd_bootm.cMarian Balakowicz2008-02-072-311/+322
| | | | | | | | | | | | | | | | | | | | | | | | - sort and cleanup headers, declarations, etc. - group related routines - cleanup indentation, white spaces Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Add memmove_wd() common routineMarian Balakowicz2008-02-072-16/+22
| | | | | | | | | | | | | | | | | | Move common, watchdog sensible memmove code to a helper memmmove_wd() routine. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Remove I386 uImage fake_header() routineMarian Balakowicz2008-02-071-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | I386 targets are not using a uImage format, instead fake header is added to ram image before it is further processed by bootm. Remove this fixup and force proper uImage use for I386. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | | [new uImage] Move CHUNKSZ definition to image.hMarian Balakowicz2008-02-071-7/+0
| | | | | | | | | | | | | | | | | | | | | CHUNKSZ defined for PPC and M68K is set to the same value of 64K, move this definition to a common header. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
OpenPOWER on IntegriCloud