diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-19 09:12:48 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-01-19 09:12:48 +0900 |
| commit | b097d552bc9ee0351bb0c3d1219856e845df59f9 (patch) | |
| tree | 3b2b8391ec989d9a8b561ce8234dde3b1d481880 /common/cmd_bootm.c | |
| parent | e598dfc22c8789991d165714bec53b2390fc999d (diff) | |
| parent | a7709d926dbc7cb1541034fcf2b21ce3e838cb12 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 94ddac37cf3..05feb394649 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -105,10 +105,6 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); typedef int boot_os_fn (int flag, int argc, char *argv[], bootm_headers_t *images); /* pointers to os/initrd/fdt */ -#define CONFIG_BOOTM_LINUX 1 -#define CONFIG_BOOTM_NETBSD 1 -#define CONFIG_BOOTM_RTEMS 1 - #ifdef CONFIG_BOOTM_LINUX extern boot_os_fn do_bootm_linux; #endif @@ -297,7 +293,8 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } - if (images.os.os == IH_OS_LINUX) { + if ((images.os.type == IH_TYPE_KERNEL) && + (images.os.os == IH_OS_LINUX)) { /* find ramdisk */ ret = boot_get_ramdisk (argc, argv, &images, IH_INITRD_ARCH, &images.rd_start, &images.rd_end); @@ -888,9 +885,6 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] image_multi_getimg (hdr, 0, os_data, os_len); break; case IH_TYPE_STANDALONE: - if (argc >2) { - hdr->ih_load = htonl(simple_strtoul(argv[2], NULL, 16)); - } *os_data = image_get_data (hdr); *os_len = image_get_data_size (hdr); break; |