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/mips | |
| 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/mips')
| -rw-r--r-- | arch/mips/configs/dlink-dir-320_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/gxemul-malta_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/img-ci20_defconfig | 10 | ||||
| -rw-r--r-- | arch/mips/configs/qemu-malta_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/ritmix-rzx50_defconfig | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/arch/mips/configs/dlink-dir-320_defconfig b/arch/mips/configs/dlink-dir-320_defconfig index 61798bf599..ba535a8bdd 100644 --- a/arch/mips/configs/dlink-dir-320_defconfig +++ b/arch/mips/configs/dlink-dir-320_defconfig @@ -13,7 +13,7 @@ CONFIG_POLLER=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_SHOW_TYPE=y CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_LOADY=y diff --git a/arch/mips/configs/gxemul-malta_defconfig b/arch/mips/configs/gxemul-malta_defconfig index 2352d38145..f009f0eecd 100644 --- a/arch/mips/configs/gxemul-malta_defconfig +++ b/arch/mips/configs/gxemul-malta_defconfig @@ -17,7 +17,7 @@ CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_IMD=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_SHOW_TYPE=y CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_LOADY=y diff --git a/arch/mips/configs/img-ci20_defconfig b/arch/mips/configs/img-ci20_defconfig index 28319c523f..f0347f686b 100644 --- a/arch/mips/configs/img-ci20_defconfig +++ b/arch/mips/configs/img-ci20_defconfig @@ -13,11 +13,11 @@ CONFIG_DEBUG_LL=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTM_VERBOSE=y -CONFIG_CMD_BOOTM_INITRD=y -CONFIG_CMD_BOOTM_OFTREE=y -CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y +CONFIG_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_VERBOSE=y +CONFIG_BOOTM_INITRD=y +CONFIG_BOOTM_OFTREE=y +CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_LOADS=y diff --git a/arch/mips/configs/qemu-malta_defconfig b/arch/mips/configs/qemu-malta_defconfig index 62b5e76f45..5389df4cb2 100644 --- a/arch/mips/configs/qemu-malta_defconfig +++ b/arch/mips/configs/qemu-malta_defconfig @@ -16,7 +16,7 @@ CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_IMD=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_SHOW_TYPE=y CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_LOADY=y diff --git a/arch/mips/configs/ritmix-rzx50_defconfig b/arch/mips/configs/ritmix-rzx50_defconfig index eedb329ee5..b143dff3c8 100644 --- a/arch/mips/configs/ritmix-rzx50_defconfig +++ b/arch/mips/configs/ritmix-rzx50_defconfig @@ -14,11 +14,11 @@ CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_IMD=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_BOOTM_SHOW_TYPE=y -CONFIG_CMD_BOOTM_VERBOSE=y -CONFIG_CMD_BOOTM_INITRD=y -CONFIG_CMD_BOOTM_OFTREE=y -CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y +CONFIG_BOOTM_SHOW_TYPE=y +CONFIG_BOOTM_VERBOSE=y +CONFIG_BOOTM_INITRD=y +CONFIG_BOOTM_OFTREE=y +CONFIG_BOOTM_OFTREE_UIMAGE=y CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_LOADS=y |