From patchwork Fri Aug 12 12:31:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 73868 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp332383qga; Fri, 12 Aug 2016 12:43:24 -0700 (PDT) X-Received: by 10.194.80.104 with SMTP id q8mr19189140wjx.151.1471031004684; Fri, 12 Aug 2016 12:43:24 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id 204si3707083wmj.131.2016.08.12.12.43.24; Fri, 12 Aug 2016 12:43:24 -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 0BA7E4B98B; Fri, 12 Aug 2016 21:43:23 +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 4583wmAe8vEl; Fri, 12 Aug 2016 21:43:22 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5BC374B951; Fri, 12 Aug 2016 21:19:33 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E33D74B660 for ; Fri, 12 Aug 2016 14:31:19 +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 RqxoCwoA8Eq3 for ; Fri, 12 Aug 2016 14:31:19 +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-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by theia.denx.de (Postfix) with ESMTPS id 467484B698 for ; Fri, 12 Aug 2016 14:30:55 +0200 (CEST) Received: by mail-qt0-f194.google.com with SMTP id c52so925361qte.1 for ; Fri, 12 Aug 2016 05:30:55 -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=IqqMFOmdvY85Z1AsIOo/lWfiNkWkfx0Fnc1QTuvYlrI=; b=b7yentrcaUQugkige6yUz/1B4Cs3B8VlytrcKnHYhOrGWnKFhhyldHpftQa5R0QaY1 Quxgg4zetMIndEV18vfs5z/siRXQGOjXOicSFqDQCCW7qsZkWFwuGzNM0PB1gfv1wt97 +/v2bLZcfVm5oReIyCsVgpy9CO/VBjdbrq1Dn+s1MLOLWWEHf2QT2zbF+xR+wunzR8gq OmFrDSVUNjf6sgYrYllOc7mUfntG9zqqTQ5+LHtDgQCuI9Clo0SK+yRzE2+Knm5y+1XC wg0jBoFW2QlA24JJOHOAAEbf6tG3s9f2hx/7HdH0Il7wgeH+RzW0CgXqSX7jGKeAHsHa WAxA== X-Gm-Message-State: AEkoouuHI9J74uzbJBCOYNKMqYd1D+v9vNyXWmnnsmJmJqXGShsIJykDT/pO4IIWPnTW5Q== X-Received: by 10.237.47.225 with SMTP id m88mr17259149qtd.106.1471005052483; Fri, 12 Aug 2016 05:30:52 -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 f17sm2977496qke.37.2016.08.12.05.30.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Aug 2016 05:30:51 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 12 Aug 2016 08:31:16 -0400 Message-Id: <1471005077-27615-2-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471005077-27615-1-git-send-email-trini@konsulko.com> References: <1471005077-27615-1-git-send-email-trini@konsulko.com> Subject: [U-Boot] [PATCH v3 2/3] 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 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(-) -- 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 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