summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-01-11 16:41:35 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-01-11 16:41:35 -0600
commite559a6901ae1c5cd02fbd909631b843975f84bbc (patch)
treef53e9435b6a1ea19eb652d3e02509582a829aa0f /common/cmd_bootm.c
parentc2871f038062abafa0b7f2048075098915a5ba41 (diff)
downloadu-boot-imx-e559a6901ae1c5cd02fbd909631b843975f84bbc.zip
u-boot-imx-e559a6901ae1c5cd02fbd909631b843975f84bbc.tar.gz
u-boot-imx-e559a6901ae1c5cd02fbd909631b843975f84bbc.tar.bz2
Add support for passing initrd information via flat device tree
Patch by Kumar Gala 11 Jan 2006
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8599a49..9562dbe 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -819,7 +819,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
#else
- ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd);
+ ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
/* ft_dump_blob(of_flat_tree); */
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
@@ -828,12 +828,16 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
/*
* Linux Kernel Parameters:
* r3: ptr to OF flat tree, followed by the board info data
- * r4: initrd_start or 0 if no initrd
- * r5: initrd_end - unused if r4 is 0
- * r6: Start of command line string
- * r7: End of command line string
+ * r4: physical pointer to the kernel itself
+ * r5: NULL
+ * r6: NULL
+ * r7: NULL
*/
- (*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end, cmd_start, cmd_end);
+ if (getenv("disable_of") != NULL)
+ (*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end,
+ cmd_start, cmd_end);
+ else
+ (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
#endif
}