summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
Commit message (Collapse)AuthorAgeLines
* Merge git://www.denx.de/git/u-bootNobuhiro Iwamatsu2007-11-29-1/+1
|\ | | | | | | | | | | Conflicts: drivers/Makefile
| * Fix two typos.Detlev Zundel2007-10-19-1/+1
| | | | | | | | Signed-off-by: Detlev Zundel <dzu@denx.de>
* | Merge git://www.denx.de/git/u-bootNobuhiro Iwamatsu2007-09-23-166/+185
|\ \ | |/ | | | | | | | | Conflicts: CREDITS
| * Bugfix: make bootm+libfdt compile on boards with no flashGrant Likely2007-09-09-0/+2
| | | | | | | | Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * Fix do_bootm_linux() so that multi-file images with FDT blob boot.Bartlomiej Sieka2007-09-07-10/+19
| | | | | | | | | | | | | | | | | | Fix incorrect blob address calculation in do_bootm_linux() that prevents booting the kernel from a multi-file image (kernel + initrd + blob). Also, make minor updates to the U-Boot's output and to the coding style. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
| * bootm/fdt: Only process the fdt if an fdt address was providedGrant Likely2007-09-06-17/+19
| | | | | | | | | | | | | | | | | | | | Boards with CONFIG_OF_LIBFDT enabled are not able to boot old-style kernels using the board info structure (instead of passing a device tree) This change allows the old style booting to be used if the fdt argument was not passed to 'bootm'. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Kim Phillips <kim.phillips@freescale.com>
| * Fix warnings from of_data copy fixAndy Fleming2007-08-16-2/+2
| | | | | | | | | | | | Forgot to cast of_flat_tree to ulong. Signed-off-by: Andy Fleming <afleming@freescale.com>
| * Fix of_data copying for CONFIG_OF_FLAT_TREE-using boardsAndy Fleming2007-08-16-0/+9
| | | | | | | | | | | | | | | | The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed" neglected to *also* put the code inside the similar #ifdef for CONFIG_OF_FLAT_TREE. Signed-off-by: Andy Fleming <afleming@freescale.com>
| * Fix where the #ifdef CFG_BOOTMAPSZ is placed.Jerry Van Baren2007-08-15-2/+3
| | | | | | | | | | | | | | | | | | | | | | Commit 073e1b509980cefe6f53c2d7fbbcd135df1e3924 "Fix initrd/dtb interaction" put the new code outside of the #if defined(CONFIG_OF_LIBFDT) when it should have gone inside of the conditional. As a result, it broke non-LIBFDT board builds. Also added a missing "not." to the comment. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| * Fix initrd/dtb interactionAndy Fleming2007-08-14-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | The original code would wrongly relocate the blob to be right before the initrd if it existed. The blob *must* be within CFG_BOOTMAPSZ, if it is defined. So we make two changes: 1) flag the blob for relocation whenever its address is above BOOTMAPSZ 2) If the blob is being relocated, relocate it before kbd, not initrd Signed-off-by: Andy Fleming <afleming@freescale.com>
| * fdt: do board setup based on fdt address specified on bootm lineKim Phillips2007-08-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The last fdt patch to bootm did board setup based on the address specified by a prior fdt address command invocation. The bootm code, as its call to fdt_chosen does, should use the fdt specified by the user on the bootm command. Note this restores full functionality for the 8360's existing default boot environment values, e.g. 'run nfsboot' (i.e. no having to 'fdt addr $fdtaddr' before booting a kernel). Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| * Call ft_board_setup() from the bootm command.Gerald Van Baren2007-08-10-0/+4
| | | | | | | | | | | | | | | | | | | | In the patch titled "Create new fdt boardsetup command..." I removed the call to ft_board_setup() from the routine fdt_chosen(), but I forgot to add a direct call back into cmd_bootm.c This fixes the oversight by adding the direct call to the bootm command. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| * Asthetic improvements: error messages and line lengths.Gerald Van Baren2007-08-10-65/+61
| | | | | | | | | | | | Tighten up the error messages, split overlength lines. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| * Reorganize and fix problems (returns) in the bootm command.Gerald Van Baren2007-08-10-66/+64
| | | | | | | | | | | | | | | | | | Do *NOT* return after the "point of no return" has been passed. If something goes wrong, the board must be reset after that point. Move the "Transferring control to Linux" debug message back to where it belongs: just before transferring control to linux. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| * Fix bugs in the CONFIG_OF_LIBFDTGerald Van Baren2007-08-10-2/+2
| | | | | | | | | | | | Stupid coding mistakes (identified by Timur Tabi, thanks). Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
| * Merge with /home/wd/git/u-boot/custodian/u-boot-testingWolfgang Denk2007-08-06-17/+17
| |\
| | * common/: Remove lingering references to CFG_CMD_* symbols.Jon Loeliger2007-07-10-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when IDE really wasn't defined/wanted. Signed-off-by: Jon Loeliger <jdl@freescale.com>
| | * common/cmd_[af]*: Remove obsolete references to CONFIG_COMMANDS.Jon Loeliger2007-07-08-11/+11
| | | | | | | | | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com>
| | * common/cmd_[a-f]* : Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).Jon Loeliger2007-07-04-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
| * | make show_boot_progress () weak.Heiko Schocher2007-07-13-38/+31
| |/ | | | | | | Signed-off-by: Heiko Schocher <hs@denx.de>
* | sh: First support code of SuperH.Nobuhiro Iwamatsu2007-05-13-0/+2
|/ | | | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* Fix initrd length corruption in bootm command.Wolfgang Denk2007-05-04-2/+1
| | | | | | | | | When using FDT Images, the length of an inital ramdisk was overwritten (bug introduced by commit 87a449c8, 22 Aug 2006). Patches by Timur Tabi & Johns Daniel. Signed-off-by: Wolfgang Denk <wd@denx.de>
* Improve the bootm command for CONFIG_OF_LIBFDTGerald Van Baren2007-04-14-8/+48
| | | | | | In bootm, create the "/chosen" node only if it doesn't already exist (better matches the previous behavior). Update for proper reserved memory map handling for initrd.
* Moved fdt command support code to fdt_support.cGerald Van Baren2007-04-06-1/+1
| | | | | ...in preparation for improving the bootm command's handling of fdt blobs. Also cleaned up some coding sloppiness.
* Fix some minor whitespace violations.Gerald Van Baren2007-03-31-1/+1
|
* Add a flattened device tree (fdt) command (2 of 2)Gerald Van Baren2007-03-31-10/+55
| | | | Modifications to the existing code to support the new fdt command.
* Code cleanup / re-insert previous Copyright entries.Wolfgang Denk2007-03-22-18/+18
| | | | Signed-off-by: Wolfgang Denk <wd@denx.de>
* [Blackfin][PATCH-2/2] Common files changed to support bf533 platformAubrey.Li2007-03-09-1/+2
|
* [PATCH] Allow CONFIG_OF_FLAT_TREE to boot a non-arch/powerpc kernelStefan Roese2006-11-27-32/+22
| | | | | | | | | This patch allows an arch/ppc kernel to be booted by just passing 1 or 2 arguments to bootm. It removes the getenv("disable_of") test that used to be used for this purpose. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Jon Loeliger <jdl@freescale.com>
* Code cleanup.Wolfgang Denk2006-10-26-3/+2
|
* Added support for Multi-Image files that contain a device treeKumar Gala2006-10-24-6/+55
| | | | | | | | | | | | | If a Multi-Image file contains a third image we try to use it as a device tree. The device tree image is assumed to be uncompressed in the image file. We automatically allocate space for the device tree in memory and provide an 8k pad to allow more than a reasonable amount of growth. Additionally, a device tree that was contained in flash will now automatically get copied to system memory as part of boot. Previously an error was reported if one tried to boot a device tree that was in flash. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
* Merge with /home/wd/git/u-boot/masterWolfgang Denk2006-10-24-5/+7
|\ | | | | | | | | (Conflicts between Jon Loeliger's and Matthew McClintock's tree were resolved by in favour of Jon's version.)
| * Fix possible uninitialized variable compiler warning.Grant Likely2006-10-12-1/+1
| | | | | | | | | | | | | | | | | | | | When CONFIG_OF_FLAG_TREE is set, the compiler complains that 'len' in do_bootm_linux() may be uninitialized. There is no possibility in the current code that len will get used uninitialized, but this fix follows the existing convention of setting both len and data to zero at the same time. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| * Merge branch 'master' of http://www.denx.de/git/u-bootJon Loeliger2006-10-10-0/+3
| |\
| * | Fix disable_of bootingMatthew McClintock2006-08-22-1/+4
| | | | | | | | | | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
| * | Support for FDT in uImage format, error when using FDT from flashMatthew McClintock2006-08-22-5/+65
| | | | | | | | | | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
| * | Unlock cache before kernel starts up for MPC86xxHaiying Wang2006-08-17-2/+2
| | |
| * | Merge branch 'mpc85xx'Jon Loeliger2006-08-09-15/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/ft_build.h include/pci.h Resolved, though.
| | * | * Patch to modify ft_build.c to update flat device trees in place Patch by ↵Matthew McClintock2006-08-09-1/+1
| | | | | | | | | | | | | | | | Matthew McClintock 26-June-2006
| | * | * Modify bootm command to support booting with flat device trees Patch by ↵Matthew McClintock2006-08-09-14/+26
| | | | | | | | | | | | | | | | Matthew McClintock 26-June-2006
| * | | Fixed initrd issue by define big RAMJin Zhengxiong2006-07-13-1/+0
| | | | | | | | | | | | | | | | Signed-off-by:Jason Jin <Jason.jin@freescale.com>
| * | | We made a u-boot patch to fix the hang up issueJason Jin2006-07-07-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | when booting filesystem from ramdisk. Signed-off-by:Jason Jin <Jason.jin@freescale.com>
| * | | Remove unneeded INIT_RAM_LOCK cache twiddling.Haiying Wang2006-05-10-2/+2
| |/ / | | | | | | | | | | | | | | | Correctly tracks r29 as global data pointer now. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
* | | Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wdWolfgang Denk2006-10-11-6/+7
|\ \ \
| * | | * Fix a bunch of compiler warnings for gcc 4.0Matthew McClintock2006-10-11-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
| * | | * Another small fix for booting with disable_ofMatthew McClintock2006-08-23-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
* | | | Merge with /home/wd/git/u-boot/masterWolfgang Denk2006-10-11-0/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Define IH_CPU_AVR32Stefan Roese2006-10-09-0/+3
| |/ | | | | | | | | | | Make it possible to generate AVR32 uImage files with mkimage and make cmd_bootm recognize them. Patch by Haavard Skinnemoen, 22 Sep 2006
* | * Fix disable_of bootingMatthew McClintock2006-08-16-1/+4
| | | | | | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
* | * Support for FDT in uImage format, error when using FDT from flashMatthew McClintock2006-08-16-5/+65
| | | | | | | | Signed-off-by: Matthew McClintock <msm@freescale.com>
generated by cgit v1.1 at 2024-11-20 15:17:59 +0000