summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* [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] Add proper ramdisk/FDT handling when FIT configuration is usedMarian Balakowicz2008-03-12-0/+3
| | | | | | | | 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] Add new uImage format support to autoscript routineMarian Balakowicz2008-03-12-1/+1
| | | | | | | | | | | | | | | 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 node offsets for FIT images listed in struct bootm_headersMarian Balakowicz2008-03-12-2/+5
| | | | | | | | 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] Remove unnecessary arguments passed to ramdisk routinesMarian Balakowicz2008-03-12-3/+2
| | | | | | | 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 support for new uImage format to mkimage toolBartlomiej Sieka2008-03-11-4/+11
| | | | | | | | | | | | | | 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-2/+151
| | | | | | | | | | | | | 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>
* libfdt: Add and use a node iteration helper function.David Gibson2008-02-29-0/+6
| | | | | | | | | 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-0/+4
| | | | Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
* [new uImage] Share common uImage code between mkimage and U-bootMarian Balakowicz2008-02-29-8/+13
| | | | | | | | | | | | | | | | | | | | 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-33/+39
| | | | | | | | | | | | | | | 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-41/+113
|\
| * Remove the __STRICT_ANSI__ check from the __u64/__s64 declaration on 32bit ↵Shinya Kuribayashi2008-02-23-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | targets. ---------------------------------------------------------------- Olaf Hering [Wed, 17 Oct 2007 06:27:13 +0000 (23:27 -0700)] Remove the __STRICT_ANSI__ check from the __u64/__s64 declaration on 32bit targets. GCC can be made to warn about usage of long long types with ISO C90 (-ansi), but only with -pedantic. You can write this in a way that even then it doesn't cause warnings, namely by: #ifdef __GNUC__ __extension__ typedef __signed__ long long __s64; __extension__ typedef unsigned long long __u64; #endif The __extension__ keyword in front of this switches off any pedantic warnings for this expression. Signed-off-by: Olaf Hering <olh@suse.de> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---------------------------------------------------------------- Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * Replace deprecated "ramdisk" with "ramdisk_size" kernel parameter.Detlev Zundel2008-02-22-3/+3
| | | | | | | | | | | | | | | | The Linux commit fac8b209b1084bc85748bd54e13d00c1262b220f ("Remove final traces of long-deprecated "ramdisk" kernel parm") makes these changes neccessary. Signed-off-by: Detlev Zundel <dzu@denx.de>
| * lwmon5: enable hardware watchdogYuri Tikhonov2008-02-22-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Some boards (e.g. lwmon5) may use rather small watchdog intervals, so causing it to reboot the board if U-Boot does a long busy-wait with udelay(). Thus, for these boards we have to restart WD more frequently. This patch splits the busy-wait udelay() into smaller, predefined, intervals, so that the watchdog timer may be resetted with the configurable (CONFIG_WD_PERIOD) interval. Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
| * ppc4xx: Support for ATI Radeon 9200 card on sequoiaAnatolij Gustschin2008-02-22-1/+25
| | | | | | | | | | | | | | | | Adds configuration option for ATI Radeon 9200 card support to sequoia config file. If CONFIG_VIDEO is enabled, TEXT_BASE should be changed to 0xFFF80000. Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xxWolfgang Denk2008-02-22-12/+12
| |\
| | * 86xx: Fix GUR PCI config registers properly.Jon Loeliger2008-02-20-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back in commit 975a083a5ef785c414b35f9c5b8ae25b26b41524 where I tried to "8610HPCD: Fix typos in two PCI setup registers", I botched it due to not realizing that 8610 and 8641 had different Global Utility Register defintions, one of which was like 85xx, and the other wasn't. Correct this problem by introducing two symbols, one for each 86xx SoC, but neither of which is named anything like 85xx. My bad. Lovely Wednesday with git bisect. You know. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| | * 8610HPCD: Don't use VIDEO/CFB_CONSOLE by default.Jon Loeliger2008-02-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Without an actual supported video card hooked up, enabling the CONFIG_VIDEO by default just makes it look broken by routing all console output to the video card. Don't. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| | * 8610HPCD: Fix typos in two PCI setup registers.Jon Loeliger2008-02-19-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The two symbols MPC86xx_PORDEVSR_IO_SEL and MPC86xx_PORBMSR_HA were erroneously present as 85xx names and values, leftover from the clone wars. Fix this by removing the 85xx cruft from the 86xx codebase. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| | * 86xx: Convert sbc8641d to use libfdt.Jon Loeliger2008-02-18-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the proper fix for a missing closing brace in the function ft_cpu_setup() noticed by joe.hamman <at> embeddedspecialties.com. The ft_cpu_setup() function in mpc8641hpcn.c should have been removed earlier as it was under the obsolete CONFIG_OF_FLAT_TREE, but was missed. Only, the sbc8641d was nominally still using it. It all got ripped out, and the funcality that was in ft_board_setup() was refactored to remove the CPU portions into the new file cpu/mpc86xx/fdt.c instead. Make sbc8641d use this now. Based loosely on an original patch from joe.hamman@embeddedspecialties.com Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | Merge branch 'master' of git://www.denx.de/git/u-boot-freebsdWolfgang Denk2008-02-22-0/+51
| |\ \
| | * | API: Add (c) and licensing notice to the public API header.Rafal Jaworowski2008-02-21-0/+51
| | |/ | | | | | | | | | Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
| * | Remove duplicate defines for ARRAY_SIZEKumar Gala2008-02-22-2/+0
| |/ | | | | | | | | | | | | A few duplicate of the ARRAY_SIZE macro sneaked in since we put the define in common.h. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* | [new uImage] Provide ability to restrict region used for boot imagesKumar Gala2008-02-29-0/+2
| | | | | | | | | | | | | | | | 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-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+2
| | | | | | | | | | | | | | | | | | 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/+56
| | | | | | | | | | | | | | | | 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-29-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-29-1/+1
| | | | | | | | | | | | | | | | | | 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-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Move image verify flag to bootm_headers structureMarian Balakowicz2008-02-27-5/+2
| | | | | | | | | | | | | | | | | | | | 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] Add dual format uImage support frameworkMarian Balakowicz2008-02-25-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Rename and move print_image_hdr() routineMarian Balakowicz2008-02-21-3/+1
| | | | | | | | Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | [new uImage] Add fit_parse_conf() and fit_parse_subimage() routinesMarian Balakowicz2008-02-21-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-21-0/+6
| | | | | | | | | | | | | | | | | | 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>
* | [new uImage] Pull in libfdt if CONFIG_FIT is enabledMarian Balakowicz2008-02-21-0/+9
| | | | | | | | | | | | | | | | | | | | | | New uImage format (Flattened Image Tree) requires libfdt functionality, print out error message if CONFIG_OF_LIBFDT is not defined. New uImage support is enabled by defining CONFIG_FIT (and CONFIG_OF_LIBFDT). This commit turns it on by default. Signed-off-by: Marian Balakowicz <m8@semihalf.com>
* | Merge branch 'master' of /home/git/u-bootMarian Balakowicz2008-02-21-12861/+62145
|\ \ | |/
| * ppc4xx: HCU4/5. Cleanup configsNiklaus Giger2008-02-16-46/+27
| | | | | | | | | | | | | | | | | | - hcu4.h: Removed define of CONFIG_PPC405GPr - Corrected phy addresses - Fix boot variables - Respect line length of 80 chars Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
| * ppc4xx: PPC405GPr fix missing register definitionsNiklaus Giger2008-02-16-0/+8
| | | | | | | | Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
| * ppc4xx: Beautify configuration files for Sequoia and Korat boardsLarry Johnson2008-02-16-235/+237
| | | | | | | | Signed-off-by: Larry Johnson <lrj@acm.org>
| * Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-0/+197
| |\
| | * Support for Artila M-501 starter kitTimo Tuunainen2008-02-14-0/+197
| | | | | | | | | | | | | | | Kimmo Leppala / Sysart and Timo Tuunainen / Sysart
| * | Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-0/+891
| |\ \
| | * | AT91CAP9 support : board/ filesStelian Pop2008-02-14-0/+212
| | | | | | | | | | | | | | | | Signed-off-by: Stelian Pop <stelian@popies.net>
| | * | AT91CAP9 support : include/ filesStelian Pop2008-02-14-0/+679
| | |/ | | | | | | | | | Signed-off-by: Stelian Pop <stelian@popies.net>
| * | Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdevPeter Pearse2008-02-15-47/+39
| |\ \
| | * | Update board NetStarPeter Pearse2008-02-14-47/+39
| | |/ | | | | | | | | | Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
| * | Fix compile warning on lib_ppc/board.cAnatolij Gustschin2008-02-15-1/+1
| | | | | | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
generated by cgit v1.1 at 2024-11-27 00:50:54 +0000