aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-03-10[new uImage] New uImage low-level APIMarian Balakowicz3-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>
2008-02-29[new uImage] Fix FDT blob totalsize calculation in boot_relocate_fdt()Marian Balakowicz1-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>
2008-02-29libfdt: Add and use a node iteration helper function.David Gibson3-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>
2008-02-29[new uImage] Add libfdt support to mkimageBartlomiej Sieka11-3/+111
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2008-02-29[new uImage] Add sha1.o object to mkimage binary buildBartlomiej Sieka2-1/+2
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2008-02-29[new uImage] Fix component handling for legacy multi component imagesMarian Balakowicz1-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>
2008-02-29[new uImage] Share common uImage code between mkimage and U-bootMarian Balakowicz3-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>
2008-02-29[new uImage] Update naming convention for bootm/uImage related codeMarian Balakowicz25-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>
2008-02-29Merge branch 'master' of git://www.denx.de/git/u-boot into new-imageMarian Balakowicz52-289/+833
2008-02-29[new uImage] Respect autostart setting in linux bootmKumar Gala10-2/+32
Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
2008-02-29[new uImage] Provide ability to restrict region used for boot imagesKumar Gala5-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>
2008-02-29[new uImage] Use lmb for bootm allocationsKumar Gala5-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>
2008-02-29[new uImage] Add autostart flag to bootm_headers structureKumar Gala3-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>
2008-02-29[new uImage] Introduce lmb from linux kernel for memory mgmt of boot imagesKumar Gala5-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>
2008-02-29[new uImage] ppc: Allow boards to specify effective amount of memoryKumar Gala1-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>
2008-02-29[new uImage] rework error handling so common functions don't resetKumar Gala4-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>
2008-02-29[new uImage] ppc: Re-order ramdisk/fdt handling sequenceKumar Gala1-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>
2008-02-29[new uImage] ppc: Determine if we are booting an OF styleKumar Gala1-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>
2008-02-29[new uImage] Don't pass kdb to ramdisk_high since we may not have oneKumar Gala4-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>
2008-02-27[new uImage] Correct raw FDT blob handlig when CONFIG_FIT is disabledMarian Balakowicz3-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>
2008-02-27[new uImage] POWERPC: Add image_get_fdt() routineMarian Balakowicz1-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>
2008-02-27[new uImage] Add image_get_kernel() routineMarian Balakowicz1-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>
2008-02-27[new uImage] Move image verify flag to bootm_headers structureMarian Balakowicz14-56/+49
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>
2008-02-27[Makefile] Sort COBJS in lib_<arch> MakefilesMarian Balakowicz11-56/+112
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2008-02-27[new uImage] Optimize gen_get_image() flow controlMarian Balakowicz1-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>
2008-02-27[new uImage] POWERPC: Split get_fdt() into get and relocate routinesMarian Balakowicz1-18/+43
PPC specific FDT blob handling code is divided into two separate routines: get_fdt() - find and verify a FDT blob (either raw or image embedded) fdt_relocate() - move FDT blob to within BOOTMAP if needed Signed-off-by: Marian Balakowicz <m8@semihalf.com> Acked-by: Kumar Gala <galak@kernel.crashing.org>
2008-02-25[new uImage] Add dual format uImage support frameworkMarian Balakowicz29-404/+1074
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>
2008-02-24Coding style cleanup. Prepare v1.3.2-rc2 release candidatev1.3.2-rc2Wolfgang Denk6-12/+480
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-02-23ENV: remove saveenv when CFG_ENV_IS_NOWHERE is selectedJean-Christophe PLAGNIOL-VILLARD1-4/+6
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-02-23Remove the __STRICT_ANSI__ check from the __u64/__s64 declaration on 32bit ↵Shinya Kuribayashi7-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>
2008-02-23cpu/mcf52x2/config.mk: Make needlessly deffered expansions immediate.Shinya Kuribayashi1-5/+5
This will reduce the build time. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2008-02-23cpu/ppc4xx/config.mk: Make a needlessly deffered expansion immediate.Shinya Kuribayashi1-1/+1
This will reduce the build time. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2008-02-23cpu/mips/cofigl.mk: Make a needlessly deffered expansion immediate.Shinya Kuribayashi1-1/+1
This reduces the build time by ~10%. Here's the gth2_config example. BEFORE AFTER real 0m31.441s 0m27.833s user 0m24.766s 0m23.045s sys 0m10.425s 0m7.468s Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2008-02-22make define2mk.sed work on FreeBSDMarcel Moolenaar1-2/+2
In the thread "[1.3.2-rc1] MPC8548CDS/MPC8555CDS configs fails to link", the define2mk.sed script was identified as the source of the link failure on FreeBSD. The problem is that sed(1) does not always support the '+' operator. It isn't on FreeBSD. The attach patch implements the equivalent, using the '*' operator instead and should work everywhere. Signed-off-by: Marcel Moolenaar <marcelm@juniper.net>
2008-02-22Replace deprecated "ramdisk" with "ramdisk_size" kernel parameter.Detlev Zundel4-4/+4
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>
2008-02-22LM75 bug fix for negative temperaturesLarry Johnson1-1/+7
When the LM75 temperature sensor measures a temperature below 0 C, the current driver does not perform sign extension, so the result returned is 256 C too high. This patch fixes the problem. Signed-off-by: Larry Johnson <lrj@acm.org>
2008-02-22IDS8247: update MAINTAINER entry.Heiko Schocher1-1/+1
Signed-off-by: Heiko Schocher <hs@denx.de>
2008-02-22Fix device tree for mgsuvd board.Heiko Schocher1-1/+1
Rename the "scc" node in "ethernet" for the mgsuvd board. Signed-off-by: Heiko Schocher <hs@denx.de>
2008-02-22lwmon5: enable hardware watchdogYuri Tikhonov2-5/+12
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>
2008-02-22ppc4xx: Support for ATI Radeon 9200 card on sequoiaAnatolij Gustschin1-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>
2008-02-22Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xxWolfgang Denk12-116/+110
2008-02-22Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashWolfgang Denk1-1/+6
2008-02-22Merge branch 'master' of git://www.denx.de/git/u-boot-freebsdWolfgang Denk1-0/+51
2008-02-22Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2-2/+2
2008-02-22Remove duplicate defines for ARRAY_SIZEKumar Gala2-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>
2008-02-22ppc: Allow boards to specify effective amount of memoryKumar Gala1-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>
2008-02-22include autoconf.mk before any other .mk filesMike Frysinger1-3/+3
This bumps the autoconf.mk include step above board/cpu/arch/etc... so that those .mk files can have make if statements based on the current config. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2008-02-22error check autoconf.mk generationMike Frysinger1-0/+1
If any of the steps for generating autoconf.mk fail currently, they go unnoticed. To fix, we can simply add 'set -e' to the long list of commands. This is simpler and more robust than placing '|| exit $$?' after every line. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2008-02-22Fix bug in dependency checkingStefano Babic1-1/+1
By adding VERSION_FILE to the PHONY targets the script /tools/setlocalversion is always called and version_autogenerated.h is replaced only if the script find a modified source file. Signed-off-by: Stefano Babic <sbabic@denx.de>
2008-02-22Fix GPMC CS2 memory setup at apollonKyungmin Park1-0/+2
It disables the current map first Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>