From 10c32ff59f7abe352b548066918bc5ea39e7c47b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 2 Dec 2009 21:15:03 -0500 Subject: config_defaults.h: new header for common u-boot config defaults There are a bunch of features in U-Boot that we want to enable by default, and it's best if we centralize them in one place rather than updating all the board files out there. Signed-off-by: Mike Frysinger --- common/cmd_bootm.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'common/cmd_bootm.c') diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 94ddac37cf3..0ef3e5ebc63 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 -- cgit v1.2.3 From 8b828a8f44b7ee9953c7ba63e64b1e80790139b3 Mon Sep 17 00:00:00 2001 From: Detlev Zundel Date: Tue, 22 Dec 2009 12:43:01 +0100 Subject: cmd_bootm.c: Do not load a ramdisk when not booting a kernel. In case we boot an image marked as 'standalone' and 'linux', the current code erroneously tried to load a ramdisk. Signed-off-by: Detlev Zundel --- common/cmd_bootm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/cmd_bootm.c') diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 0ef3e5ebc63..dc993d54087 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -293,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); -- cgit v1.2.3 From c3d7eec6d88945dec0626cdd4f4a35cb5f83ef00 Mon Sep 17 00:00:00 2001 From: Detlev Zundel Date: Tue, 22 Dec 2009 12:43:02 +0100 Subject: cmd_bootm.c: Change interpretation of standalone image parameters. Current code uses the second argument to bootm for standalone images to override the load address specified in the image instead of passing all parameters as is to the application. This behaviour is not documented and not in line with how the go command works for standalone applications, so we simply drop it. Signed-off-by: Detlev Zundel --- common/cmd_bootm.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'common/cmd_bootm.c') diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index dc993d54087..05feb394649 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -885,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; -- cgit v1.2.3