summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2008-03-12Merge branch 'master' of git://www.denx.de/git/u-boot into new-imageMarian Balakowicz
2008-03-12[new uImage] Fix definition of common bootm_headers_t fieldsMarian Balakowicz
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>
2008-03-12[new uImage] Add proper ramdisk/FDT handling when FIT configuration is usedMarian Balakowicz
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>
2008-03-12[new uImage] Add new uImage format support to autoscript routineMarian Balakowicz
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>
2008-03-12[new uImage] Add node offsets for FIT images listed in struct bootm_headersMarian Balakowicz
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>
2008-03-12[new uImage] Remove unnecessary arguments passed to ramdisk routinesMarian Balakowicz
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>
2008-03-11[new uImage] Add support for new uImage format to mkimage toolBartlomiej Sieka
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>
2008-03-10[new uImage] Make node unit names const in struct bootm_headersMarian Balakowicz
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
2008-03-10[new uImage] New uImage low-level APIMarian Balakowicz
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-03-08Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xxWolfgang Denk
2008-03-08Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xxWolfgang Denk
2008-03-08mgsuvd: update board configurationHeiko Schocher
initialize the UPIOx controller. Signed-off-by: Heiko Schocher <hs@denx.de>
2008-03-08mgcoge: update board configurationHeiko Schocher
add support for the config Flash. initialize the UPIOx controller. Signed-off-by: Heiko Schocher <hs@denx.de>
2008-03-07mpc83xx: make dtb basename file references equal those of linuxKim Phillips
the dts file basenames were updated in linux - this helps avoid inadvertently loading any old dtbs laying around. Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
2008-03-07ppc4xx: Sequoia: Add device tree (fdt) Linux booting default env variablesStefan Roese
Signed-off-by: Stefan Roese <sr@denx.de>
2008-03-07837xEMDS: Improve the system performanceDave Liu
1. Make the CSB bus pipeline depth as 4, and enable the repeat mode; 2. Raise the eTSEC emergency priority; 3. Use the highest IP blocks clock. Signed-off-by: Dave Liu <daveliu@freescale.com>
2008-03-06Replace "run load; run update" with conditionalized "run load update".Detlev Zundel
The latter version stops when "run load" fails for whatever reasons rendering the combination *a lot* more secure. Signed-off-by: Detlev Zundel <dzu@denx.de>
2008-03-04PCS440EP: fix build problems (redundant #define)Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-03-03Fix endianess problem in cramfs code (cramfs is always host-endian in Linux)Bernhard Nemec
Originally pointed out by Laurent Pinchart <laurent.pinchart@tbox.biz>, see http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/22846 Signed-off-by: Bernhard Nemec <bnemec <at> ganssloser.com>
2008-03-03Fix quoting problem (preboot setting) in many board config files.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-03-03ADS5121: Fix default environment.Wolfgang Denk
Signed-off-by: Wolfgang Denk <wd@denx.de>
2008-03-03Fix checking fat32 cluster size.michael
This fixes the cluster size tests in the FAT32 file system. The current implementation of VFAT support doesn't work if the referred cluster has an offset > 16bit representation, causing "fatload" and "fatls" commands etc. to fail. Signed-off-by: michael trimarchi <trimarchi@gandalf.sssup.it>
2008-03-02ppc4xx: EMAC: Fix 405EZ fifo size setup in EMAC_MR1Stefan Roese
The 405EZ only supports 512 bytes of rx-/tx-fifo EMAC sizes. But currently 4k/2k is configured. This patch fixes this issue. Thanks to Thomas Kindler <tkindler@lenord.de> for pointing this out. Signed-off-by: Stefan Roese <sr@denx.de>
2008-03-02Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xxWolfgang Denk
2008-03-02MPC5121e ADS PCI support take 3John Rigby
Adds PCI support for MPC5121 Tested with drivers/net/rtl8139.c Support is conditional since PCI on old silicon does not work. ads5121_PCI_config turns on PCI In this version, condition compilation of PCI code has been moved from ifdef in board/ads5121/pci.c to board/ads5121/Makefile as suggested by Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: John Rigby <jrigby@freescale.com>
2008-03-02arm-imx: Fix register definitionsJean-Christophe PLAGNIOL-VILLARD
Sync register definitions with linux Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-03-02Remove the __STRICT_ANSI__ check from the __u64/__s64 declaration on 32bit ↵Shinya Kuribayashi
targets. The previous patch was lacking of i386, microblaze, nios and nios2. This patch tries to fix them. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
2008-02-29libfdt: Add and use a node iteration helper function.David Gibson
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 Sieka
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
2008-02-29[new uImage] Share common uImage code between mkimage and U-bootMarian Balakowicz
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 Balakowicz
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 Balakowicz
2008-02-29[new uImage] Provide ability to restrict region used for boot imagesKumar Gala
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 Gala
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 Gala
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 Gala
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] rework error handling so common functions don't resetKumar Gala
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] Don't pass kdb to ramdisk_high since we may not have oneKumar Gala
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-27sbc8548: Fix cfi flash bank declarationJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2008-02-27[new uImage] Correct raw FDT blob handlig when CONFIG_FIT is disabledMarian Balakowicz
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] Move image verify flag to bootm_headers structureMarian Balakowicz
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-25[new uImage] Add dual format uImage support frameworkMarian Balakowicz
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-23Remove the __STRICT_ANSI__ check from the __u64/__s64 declaration on 32bit ↵Shinya Kuribayashi
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-22Replace deprecated "ramdisk" with "ramdisk_size" kernel parameter.Detlev Zundel
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-22lwmon5: enable hardware watchdogYuri Tikhonov
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 Gustschin
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 Denk
2008-02-22Merge branch 'master' of git://www.denx.de/git/u-boot-freebsdWolfgang Denk
2008-02-22Remove duplicate defines for ARRAY_SIZEKumar Gala
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-21[new uImage] Rename and move print_image_hdr() routineMarian Balakowicz
Signed-off-by: Marian Balakowicz <m8@semihalf.com>