diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-10 14:51:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-10 14:51:58 +0200 |
| commit | 7839011f61c02b42b44e540dfb18464f4bb79fba (patch) | |
| tree | e80f59c4ca1d7a7ee9b9a24941212ef4375bcbd1 /arch/arm/lib/bootm.c | |
| parent | ece204a8acea2ae5f4343fef28e9e987a133e9ea (diff) | |
| download | barebox-7839011f61c02b42b44e540dfb18464f4bb79fba.tar.gz barebox-7839011f61c02b42b44e540dfb18464f4bb79fba.tar.xz | |
bootm: Move bootm options to common/Kconfig
bootm has a C API, so the bootm options have to depend on the
option providing the bootm code (CONFIG_BOOTM), not on the
option providing the command (CONFIG_CMD_BOOTM). Fixing the
dependencies makes it possible to fully use bootm from C without
enabling the bootm command support.
This also removes the CMD_ prefix from the options which means
we have to update the defconfigs aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/lib/bootm.c')
| -rw-r--r-- | arch/arm/lib/bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index f6024c80ec..803aa94490 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -539,7 +539,7 @@ static struct image_handler aimage_handler = { .filetype = filetype_aimage, }; -#ifdef CONFIG_CMD_BOOTM_AIMAGE +#ifdef CONFIG_BOOTM_AIMAGE BAREBOX_MAGICVAR(aimage_noverwrite_bootargs, "Disable overwrite of the bootargs with the one present in aimage"); BAREBOX_MAGICVAR(aimage_noverwrite_tags, "Disable overwrite of the tags addr with the one present in aimage"); #endif @@ -571,7 +571,7 @@ static int armlinux_register_image_handler(void) register_image_handler(&uimage_handler); register_image_handler(&rawimage_handler); register_image_handler(&zimage_handler); - if (IS_BUILTIN(CONFIG_CMD_BOOTM_AIMAGE)) { + if (IS_BUILTIN(CONFIG_BOOTM_AIMAGE)) { register_image_handler(&aimage_handler); binfmt_register(&binfmt_aimage_hook); } |