summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* [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
|\
| * Coding style cleanup. Prepare v1.3.2-rc2 release candidateWolfgang Denk2008-02-24-12/+480
| | | | | | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
| * ENV: remove saveenv when CFG_ENV_IS_NOWHERE is selectedJean-Christophe PLAGNIOL-VILLARD2008-02-23-4/+6
| | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * 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>
| * cpu/mcf52x2/config.mk: Make needlessly deffered expansions immediate.Shinya Kuribayashi2008-02-23-5/+5
| | | | | | | | | | | | This will reduce the build time. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * cpu/ppc4xx/config.mk: Make a needlessly deffered expansion immediate.Shinya Kuribayashi2008-02-23-1/+1
| | | | | | | | | | | | This will reduce the build time. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
| * cpu/mips/cofigl.mk: Make a needlessly deffered expansion immediate.Shinya Kuribayashi2008-02-23-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>
| * make define2mk.sed work on FreeBSDMarcel Moolenaar2008-02-22-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>
| * Replace deprecated "ramdisk" with "ramdisk_size" kernel parameter.Detlev Zundel2008-02-22-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>
| * LM75 bug fix for negative temperaturesLarry Johnson2008-02-22-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>
| * IDS8247: update MAINTAINER entry.Heiko Schocher2008-02-22-1/+1
| | | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
| * Fix device tree for mgsuvd board.Heiko Schocher2008-02-22-1/+1
| | | | | | | | | | | | Rename the "scc" node in "ethernet" for the mgsuvd board. Signed-off-by: Heiko Schocher <hs@denx.de>
| * lwmon5: enable hardware watchdogYuri Tikhonov2008-02-22-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>
| * 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-116/+110
| |\
| | * 8610HPCD: Document the flashbank selection switches.Jon Loeliger2008-02-20-0/+6
| | | | | | | | | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com>
| | * 86xx: Fix GUR PCI config registers properly.Jon Loeliger2008-02-20-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * mpc86xx: Fix unused variable 'config' and 'immap'Jean-Christophe PLAGNIOL-VILLARD2008-02-18-4/+6
| | | | | | | | | | | | | | | | | | and remove useless CONFIG_DDR_INTERLEAVE Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| | * mpc86xx: Fix implicit declaration of functions 'init_laws' and 'disable_law'Jean-Christophe PLAGNIOL-VILLARD2008-02-18-0/+1
| | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flashWolfgang Denk2008-02-22-1/+6
| |\ \
| | * | CFI: Do not use uninitialized cmd_resetMichael Schwingen2008-02-21-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use uninitialized cmd_reset; issue both AMD and Intel reset commands instead From a short test, it looks like AMD-style flash roms treat *any* unknown command write as a reset, at least when in CFI Query mode, so issuing the Intel reset command to AMD-style flashs seems safe (from the small sample I have), plus the 3-cycle magic sequence should kick the state machine into the right state even without a reset command. Since the AMD-style flashs require the unlock sequence for real operation, I chose to try the AMD reset command first, so that Intel flashs do no see an invalid command prior to the CFI query. I have tested the patch on AM29LV320-style flashs from Fujitsu and Macronix, plus Intel StrataFlash. Signed-off-by: Michael Schwingen <michael@schwingen.org> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | 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>
| * | | Merge branch 'master' of git://www.denx.de/git/u-boot-coldfireWolfgang Denk2008-02-22-2/+2
| |\ \ \
| | * | | ColdFire: Fix missing code flash size for M5485EVBTsiChungLiew2008-02-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Mahan <kmahan@freescale.com> Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
| | * | | ColdFire: Fix 5282 and 5271 interrupt mask bitTsiChungLiew2008-02-20-1/+1
| | |/ / | | | | | | | | | | | | Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.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>
| * | | ppc: Allow boards to specify effective amount of memoryKumar Gala2008-02-22-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>
| * | | include autoconf.mk before any other .mk filesMike Frysinger2008-02-22-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>
| * | | error check autoconf.mk generationMike Frysinger2008-02-22-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>
| * | | Fix bug in dependency checkingStefano Babic2008-02-22-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>
| * | | Fix GPMC CS2 memory setup at apollonKyungmin Park2008-02-22-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | It disables the current map first Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
| * | | uli526x: Fix multiple differ in signedness and parentheses around comparisonJean-Christophe PLAGNIOL-VILLARD2008-02-22-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | MIPS: Fix CFG_NO_FLASH supportJean-Christophe PLAGNIOL-VILLARD2008-02-22-46/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix flash_init call when CFG_NO_FLASH is used - Remove no more needed flash.c for qemu-mips Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| * | | easylogo: clean up some more and add -r (rgb) supportMike Frysinger2008-02-22-54/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Michael Hennerich added support for outputting an image in RGB format rather than forcing YUYV all the time. This makes obvious sense if the display you have takes RGB input rather than YUYV. Rather than hack in support for options, I've converted it to use getopt and cleaned up the argument parsing in the process. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | | Makefile: add target for $(LDSCRIPT)Mike Frysinger2008-02-22-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the $(LDSCRIPT) does not exist (normally it's board/$(BOARD)/u-boot.lds), then change into the board directory and try and create it. This allows you to generate the linker script on the fly based upon board defines (like the Blackfin boards do). There should be no regressions due to this change as the normal case is to already have a u-boot.lds file. If that's the case, then there's nothing to generate, and so make will always exit. The fix here is that if the linker script does not exist, the implicit rules take over and attempt to guess how to generate the file. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | [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>
generated by cgit v1.1 at 2024-12-02 01:37:22 +0000