diff options
| -rw-r--r-- | arch/arm/lib/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/lib/armlinux.c | 4 | ||||
| -rw-r--r-- | commands/Kconfig | 8 | ||||
| -rw-r--r-- | include/asm-arm/armlinux.h | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 79bf00a418..00e0ea5704 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -1,5 +1,4 @@ -obj-$(CONFIG_CMD_BOOTM) += armlinux.o - +obj-y += armlinux.o obj-y += _ashldi3.o obj-y += _ashrdi3.o obj-y += cache.o diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 61cd13ab2a..6e8428919c 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -147,6 +147,7 @@ void armlinux_add_dram(struct device_d *dev) list_add_tail(&mem->list, &memory_list); } +#ifdef CONFIG_CMD_BOOTM int do_bootm_linux(struct image_data *data) { void (*theKernel)(int zero, int arch, void *params); @@ -224,7 +225,9 @@ static int armlinux_register_image_handler(void) } late_initcall(armlinux_register_image_handler); +#endif /* CONFIG_CMD_BOOTM */ +#ifdef CONFIG_CMD_BOOTZ struct zimage_header { u32 unsused[9]; u32 magic; @@ -302,5 +305,6 @@ U_BOOT_CMD_START(bootz) .cmd = do_bootz, .usage = "bootz - start a zImage", U_BOOT_CMD_END +#endif /* CONFIG_CMD_BOOTZ */ diff --git a/commands/Kconfig b/commands/Kconfig index a91bcef962..db086fc921 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -207,6 +207,14 @@ config CMD_BOOTM_SHOW_TYPE depends on CMD_BOOTM prompt "show image information" +config CMD_BOOTZ + tristate + default y + depends on ARM + prompt "bootz" + help + compile in the 'bootz' command to start zImages + config CMD_RESET tristate prompt "reset" diff --git a/include/asm-arm/armlinux.h b/include/asm-arm/armlinux.h index 12a178290d..fa75fafb8a 100644 --- a/include/asm-arm/armlinux.h +++ b/include/asm-arm/armlinux.h @@ -1,7 +1,7 @@ #ifndef __ARCH_ARMLINUX_H #define __ARCH_ARMLINUX_H -#ifdef CONFIG_CMD_BOOTM +#if defined CONFIG_CMD_BOOTM || defined CONFIG_CMD_BOOTZ void armlinux_set_bootparams(void *params); void armlinux_set_architecture(int architecture); void armlinux_add_dram(struct device_d *dev); |