summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-05-10 14:51:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-05-10 14:51:58 +0200
commit7839011f61c02b42b44e540dfb18464f4bb79fba (patch)
treee80f59c4ca1d7a7ee9b9a24941212ef4375bcbd1 /arch/nios2
parentece204a8acea2ae5f4343fef28e9e987a133e9ea (diff)
downloadbarebox-7839011f61c02b42b44e540dfb18464f4bb79fba.tar.gz
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/nios2')
-rw-r--r--arch/nios2/configs/generic_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/configs/generic_defconfig b/arch/nios2/configs/generic_defconfig
index 9f9c85e..39f41dd 100644
--- a/arch/nios2/configs/generic_defconfig
+++ b/arch/nios2/configs/generic_defconfig
@@ -17,8 +17,8 @@ CONFIG_CMD_READLINE=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_ECHO_E=y
CONFIG_CMD_FLASH=y
-CONFIG_CMD_BOOTM_SHOW_TYPE=y
-CONFIG_CMD_BOOTM_VERBOSE=y
+CONFIG_BOOTM_SHOW_TYPE=y
+CONFIG_BOOTM_VERBOSE=y
CONFIG_CMD_UIMAGE=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y