diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-19 10:45:03 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-19 10:50:31 +0200 |
commit | 5db3059ebc856711db3254cb1ffa61783d48391b (patch) | |
tree | 704d5acfba9527e9526453a6ca99bdbedcd63da4 /arch/arm | |
parent | 6df1e4b20a3870abeee205627d041f4538b4a391 (diff) | |
download | barebox-5db3059ebc856711db3254cb1ffa61783d48391b.tar.gz barebox-5db3059ebc856711db3254cb1ffa61783d48391b.tar.xz |
arm: make 'bootz' configurable
also, fix compilation with bootm disabled
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/lib/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/lib/armlinux.c | 4 |
2 files changed, 5 insertions, 2 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 */ |