From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig
Date: Fri, 12 Aug 2016 08:31:16 -0400 [thread overview]
Message-ID: <1471005077-27615-2-git-send-email-trini@konsulko.com> (raw)
In-Reply-To: <1471005077-27615-1-git-send-email-trini@konsulko.com>
From: Masahiro Yamada <yamada.masahiro@socionext.com>
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>
---
Changes in v3:
- None
Changes in v2:
- Move to default y so this isn't in the defconfig files
- Reword help text slightly
---
Kconfig | 1 +
cmd/Kconfig | 7 +++++++
include/config_distro_defaults.h | 3 ---
include/configs/uniphier.h | 1 -
include/configs/vexpress_aemv8a.h | 1 -
include/configs/xilinx_zynqmp.h | 1 -
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Kconfig b/Kconfig
index 1119b1971666..0bc06d859f75 100644
--- 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 d69b817c827b..e21924639fa5 100644
--- 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 924468045262..b5efab5c3f9c 100644
--- 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 950c5353d253..0f5b20ff48c4 100644
--- 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 46cf83be02e0..9aca3936fb13 100644
--- 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 297cc4d5f3dd..ca60e5d3d9cd 100644
--- 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
--
1.9.1
next prev parent reply other threads:[~2016-08-12 12:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-12 12:31 [U-Boot] [PATCH v3 1/3] cmd: Split 'bootz' and 'booti' out from 'bootm' Tom Rini
2016-08-12 12:31 ` Tom Rini [this message]
2016-08-21 15:08 ` [U-Boot] [U-Boot, v3, 2/3] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig Tom Rini
2016-08-12 12:31 ` [U-Boot] [PATCH v3 3/3] Kconfig: DISTRO_DEFAULTS: Only enable CMD_BOOTZ for ARM Tom Rini
2016-08-21 15:08 ` [U-Boot] [U-Boot, v3, " Tom Rini
2016-08-21 15:08 ` [U-Boot] [U-Boot, v3, 1/3] cmd: Split 'bootz' and 'booti' out from 'bootm' Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471005077-27615-2-git-send-email-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox