From patchwork Tue Mar 5 05:53:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1051624 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="h+MX7zNF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44D5ft6ftLz9s1B for ; Tue, 5 Mar 2019 16:53:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 73674C21DA1; Tue, 5 Mar 2019 05:52:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D215DC21C38; Tue, 5 Mar 2019 05:52:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AEE5CC21DA2; Tue, 5 Mar 2019 05:52:04 +0000 (UTC) Received: from mail-yw1-f44.google.com (mail-yw1-f44.google.com [209.85.161.44]) by lists.denx.de (Postfix) with ESMTPS id 1FDA3C21E30 for ; Tue, 5 Mar 2019 05:52:01 +0000 (UTC) Received: by mail-yw1-f44.google.com with SMTP id 189so6072560ywi.3 for ; Mon, 04 Mar 2019 21:52:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tqJj1MifuuAMKX7ZTJwBmZ0a62lNmha/+Gs3R0OjvAM=; b=h+MX7zNF/02z8xa0T+q/goLdkmvJWcM6aijabbgc61pSmtyunEt3XAaYwQSkx4ud8t oedKXXEVnAGkouxtM2hKomfQKrIdytuCDWI01O8U+2jc45XEyEOIDEa49MMJRIGFxdMK SswEx83C9/HvbHWPlvz61GiEa9aeuWVG/npLnCAyh3JphB1uPjVq9wpkHLck6mF7rCZ1 QOjL2hHHjXzojdIRJxEzc0dKhm3MOnazewxUNiNt9QCOfodRP48YbmLYH/qiUrX+aaaD p5nDFYbkpBpKGRoIidNq+BCsFxYsEMA7R5jr/PkogAQs1iktGd9ww/lDO5AHyXiRNzKD UtwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tqJj1MifuuAMKX7ZTJwBmZ0a62lNmha/+Gs3R0OjvAM=; b=K4srIW0RMTctqbV09TGv6uX4Pb3zInzjIFx92ntLK5vwZYZe9zPwY8/nQU8ZuccTwK W3gvjdpHrVLtgkIqXcWwUpVhFYZaviuXygEZHWmER4RUJFouLLVBUn7RxuDP5LbIm4zE rym7By6W+rEskYQMwSn+vZLLEdHOX7vSW01oXVENuvNMSfqa0mpP3uTavpNXha7yCNUJ gnhsArewFVI8eBfDPgA4e1W4ojtyy13bviwXGQ6iAnbJY4xhonifjDaVtnGKt04I9LFm lPnieaUQetO/0qr6C64I25gUuZ27rEOTRdpFc364IxLN5LuJNuF4v9PX0txJGiCk/eOa Es1g== X-Gm-Message-State: APjAAAVSUYAP2M/tCBdalOTVMt1Uvcd3QU5jgC7EwPJcfi9REbL0Yy1X uCj4PAz3e9bSidh6COcxKrdMag== X-Google-Smtp-Source: APXvYqx7ZY2ZqG0MzW2vxi/kaIfQeLQaiGO2bdfqz2s7XZ/zLds8kdVBr0DIdqKEQHNk2S7k2xhS0Q== X-Received: by 2002:a0d:dc83:: with SMTP id f125mr17519332ywe.67.1551765118658; Mon, 04 Mar 2019 21:51:58 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id p13sm803142ywe.80.2019.03.04.21.51.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 21:51:58 -0800 (PST) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@suse.de Date: Tue, 5 Mar 2019 14:53:34 +0900 Message-Id: <20190305055337.3793-6-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305055337.3793-1-takahiro.akashi@linaro.org> References: <20190305055337.3793-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [RFC 5/8] cmd: bootefi: carve out fdt handling X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This is a preparatory patch for reworking do_bootefi() in later patch. Signed-off-by: AKASHI Takahiro --- cmd/bootefi.c | 53 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 1d90e7b4b575..8915cdbfd5f5 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -198,6 +198,40 @@ static efi_status_t efi_install_fdt(ulong fdt_addr) return ret; } +/** + * efi_process_fdt() - process fdt passed by a command argument + * @fdt_opt: pointer to argument + * Return: CMD_RET_SUCCESS on success, + CMD_RET_USAGE or CMD_RET_FAILURE otherwise + * + * If specified, fdt will be installed as configuration table, + * otherwise no fdt will be passed. + */ +static int efi_process_fdt(const char *fdt_opt) +{ + unsigned long fdt_addr; + efi_status_t r; + + if (fdt_opt) { + fdt_addr = simple_strtoul(fdt_opt, NULL, 16); + if (!fdt_addr && *fdt_opt != '0') + return CMD_RET_USAGE; + + /* Install device tree */ + r = efi_install_fdt(fdt_addr); + if (r != EFI_SUCCESS) { + printf("ERROR: failed to install device tree\n"); + return CMD_RET_FAILURE; + } + } else { + /* Remove device tree. EFI_NOT_FOUND can be ignored here */ + efi_install_configuration_table(&efi_guid_fdt, NULL); + printf("WARNING: booting without device tree\n"); + } + + return CMD_RET_SUCCESS; +} + static efi_status_t bootefi_run_prepare(const char *load_options_path, struct efi_device_path *device_path, struct efi_device_path *image_path, @@ -407,21 +441,10 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 2) return CMD_RET_USAGE; - if (argc > 2) { - fdt_addr = simple_strtoul(argv[2], NULL, 16); - if (!fdt_addr && *argv[2] != '0') - return CMD_RET_USAGE; - /* Install device tree */ - r = efi_install_fdt(fdt_addr); - if (r != EFI_SUCCESS) { - printf("ERROR: failed to install device tree\n"); - return CMD_RET_FAILURE; - } - } else { - /* Remove device tree. EFI_NOT_FOUND can be ignored here */ - efi_install_configuration_table(&efi_guid_fdt, NULL); - printf("WARNING: booting without device tree\n"); - } + ret = fdt_process_fdt(argc > 2 ? argv[2] : NULL); + if (ret != EFI_SUCCESS) + return ret; + #ifdef CONFIG_CMD_BOOTEFI_HELLO if (!strcmp(argv[1], "hello")) { ulong size = __efi_helloworld_end - __efi_helloworld_begin;