diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 19:11:42 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 19:11:42 +0100 |
| commit | a3f0169880a44ac06de5177e7926d7c732368663 (patch) | |
| tree | 34d2fcde4020719ecb435acce0ecf698c63dd86e /common/cmd_bootm.c | |
| parent | 3b2e4fd9b0348d49e7b55a19a0c919f6c83d9a43 (diff) | |
| parent | 62ec6418d417b1fc887f979441c15fbd6602edc9 (diff) | |
| download | u-boot-imx-a3f0169880a44ac06de5177e7926d7c732368663.zip u-boot-imx-a3f0169880a44ac06de5177e7926d7c732368663.tar.gz u-boot-imx-a3f0169880a44ac06de5177e7926d7c732368663.tar.bz2 | |
Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#ft_infr
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 5b93bdd..a20e584 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -821,7 +821,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) @@ -830,12 +830,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 } |