cmd: booti: move CONFIG_CMD_BOOTI to Kconfig

This command is used to boot ARM64 Linux.

I made DISTRO_DEFAULTS select this option for ARM64 to respect
include/config_distro_defaults.h.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Kconfig b/Kconfig
index cb5af5b..7c87148 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -58,6 +58,7 @@ config DISTRO_DEFAULTS
        default y if ARCH_SUNXI
        default n
        select CMD_BOOTZ
+       select CMD_BOOTI if ARM64
        select CMD_DHCP
        select CMD_EXT2
        select CMD_EXT4

diff --git a/cmd/Kconfig b/cmd/Kconfig
index d69b817..e219246 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -165,6 +165,13 @@ config CMD_BOOTZ
        help
          Boot the Linux zImage
 
+config CMD_BOOTI
+       bool "booti"
+       depends on ARM64
+       default y
+       help
+         Boot an AArch64 Linux Kernel image from memory.
+
 config CMD_BOOTEFI
        bool "bootefi"
        depends on EFI_LOADER

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 9244680..b5efab5 100644 (file)
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -20,9 +20,6 @@
 #define CONFIG_BOOTP_PXE
 #define CONFIG_BOOTP_SUBNETMASK
 
-#ifdef CONFIG_ARM64
-#define CONFIG_CMD_BOOTI
-#endif
 #define CONFIG_CMD_PXE
 
 #define CONFIG_CMDLINE_EDITING

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 950c535..0f5b20f 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -189,7 +189,6 @@
        "__nfsboot=run tftpboot\0"
 #else
 #ifdef CONFIG_ARM64
-#define CONFIG_CMD_BOOTI
 #define CONFIG_BOOTFILE                        "Image"
 #define LINUXBOOT_CMD                  "booti"
 #define KERNEL_ADDR_R                  "kernel_addr_r=0x80080000\0"

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 46cf83b..9aca393 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -133,7 +133,6 @@
 /* Command line configuration */
 #define CONFIG_MENU
 /*#define CONFIG_MENU_SHOW*/
-#define CONFIG_CMD_BOOTI
 #define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_PXE
 #define CONFIG_CMD_ENV

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 297cc4d..ca60e5d 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -205,7 +205,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
 
-#define CONFIG_CMD_BOOTI
 #define CONFIG_CMD_UNZIP
 
 #define CONFIG_BOARD_EARLY_INIT_R