From patchwork Mon Aug 1 15:28:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 73107 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2760704qga; Mon, 1 Aug 2016 08:28:36 -0700 (PDT) X-Received: by 10.28.29.215 with SMTP id d206mr15104616wmd.75.1470065311654; Mon, 01 Aug 2016 08:28:31 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id m5si16510490wmi.65.2016.08.01.08.28.31; Mon, 01 Aug 2016 08:28:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B11CCA7558; Mon, 1 Aug 2016 17:28:27 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wFWvMDm-wqfF; Mon, 1 Aug 2016 17:28:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 44F2EA7560; Mon, 1 Aug 2016 17:28:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7FE2CA74F1 for ; Mon, 1 Aug 2016 17:28:18 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pXbd4_xrpJEG for ; Mon, 1 Aug 2016 17:28:18 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by theia.denx.de (Postfix) with ESMTPS id 1F9D1A74DB for ; Mon, 1 Aug 2016 17:28:14 +0200 (CEST) Received: by mail-qt0-f195.google.com with SMTP id u25so8215383qtb.3 for ; Mon, 01 Aug 2016 08:28:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s01tBgrHDk+/25a82jSggO7NozVZrh8bEgj9fF5PYow=; b=lo6zfY/y/bIjP9B3ByzEcIEkFdaoDVMjM/SETO0qedMfyfTj6l+EWxhouuijFLwQjD 98gbodutMFrVFu7cOpPcPhQAjm+8AOCl21nXKImP1QwF/yY23XhTlcrN8U1H7t7dB0Fy XlxDFGJRdrNJffZU76XNxY7nEcEePJymA1x5oHLATnl88spFPo+F+UI18ULew9B3lk5E 9xODkUGg5g8MkdwEz4OrsZacyqm7GiM+wlbll9xN58AB1B/1T2191EPSBpcbQB3RkvYD Do3X4uqkfs32Twkhsl3cP6uOWS4dr/gJrzD+05zp5JsQsoNA+I2iqYnqrrpPbNZmruJk TgUw== X-Gm-Message-State: AEkooutQV1RT6hQIqSNqVDaOKHBZyCdgcuWGKVUZ+ysi7+CrmUxTiXA+oGdQE7rw2cFMxg== X-Received: by 10.200.49.203 with SMTP id i11mr89347545qte.40.1470065292982; Mon, 01 Aug 2016 08:28:12 -0700 (PDT) Received: from localhost.localdomain (cpe-75-180-230-22.ec.res.rr.com. [75.180.230.22]) by smtp.gmail.com with ESMTPSA id l89sm17739439qte.41.2016.08.01.08.28.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Aug 2016 08:28:10 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 1 Aug 2016 11:28:22 -0400 Message-Id: <1470065302-30163-2-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470065302-30163-1-git-send-email-trini@konsulko.com> References: <1470065302-30163-1-git-send-email-trini@konsulko.com> Subject: [U-Boot] [PATCH v2 2/2] cmd: booti: move CONFIG_CMD_BOOTI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Masahiro Yamada 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 Signed-off-by: Tom Rini --- 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(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/Kconfig b/Kconfig index ef12f9f..189bcf4 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 d69b817..e219246 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 9244680..b5efab5 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 e485583..7e6d5a5 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -183,7 +183,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 --- 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 e776e32..173e0c9 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -206,7 +206,6 @@ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) -#define CONFIG_CMD_BOOTI #define CONFIG_CMD_UNZIP #define CONFIG_BOARD_EARLY_INIT_R