From patchwork Wed Jan 10 01:16:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 761427 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp1650967wrz; Tue, 9 Jan 2024 17:17:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHgfbVduc7WknKVes1/yKbLcRXhR3+rv3nTrgEgx3TNlXU73VwNOInZrbtRBnEfYD2Pug6D X-Received: by 2002:a05:6000:83:b0:336:364c:9de4 with SMTP id m3-20020a056000008300b00336364c9de4mr820815wrx.1.1704849468962; Tue, 09 Jan 2024 17:17:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704849468; cv=none; d=google.com; s=arc-20160816; b=u99UnVUlxe03Run4aTTJ1//00S4S25znyEQKPpQueoB9EI8gIVMNOCKP6RKNxPp1lt BLMtTYgd3IySGMyiWTlAeRmHQvHcjX4lcffTMaXn9NFNgMY1nWhgwWi9ivnupzcwu1VX tnCM7Mo+UyaRjBPuzd0SPRPHrvv0F6Prptl/MvpD1fm3e43g9D/0PhOKD4awimq3EFVa CC5RIciLI/be5slUzZgS3AVmwUi2bHBr3YEB9UTL91JeB8zuBswmA3Q0GPhNsh6NhKxk TJiSmS+revuhAUwv1okg0YhGlUZo4zQWu9AMMt4HKT03DfOrqFLx1VUSJa+94PgFVICb PYoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uLu8RNfQOxa+r7scNxZe5YOo/ZxWLLZ6QlPdhb7HAxM=; fh=p8OTi/tJSbfUA0ykVxDxRCnpqUhQqJazFYHXT9edm5U=; b=aEviK0H50uVZXS7azpIHXnjQFYf/ExnFyuP81hQX5U0djHUk6f/GO+4m5hjcglbeXY v1JAuGnGFUbPs0pXrBMDRQxNng8ZUy3ZDzTf1ANoRG3vE/xSUXyrqDN1NcCLBeoSzREY jJH8OrD5nBVK3bdNy2f1AHoPdkjXtMD+XdQjBVylixHpyra4t8R3FRAJ0/WyCIfepRA1 7IYc1q/lDhZ2qrKmy4Ram28aSuQhrkLZhUEbB5o3vrU+QdI3CRY4Jq+B5oP6Xgzu+7bG m/ZSQq4EKsnOKPnsovsioEKgU0bT5I0D2bxaa8zgaoyszQaaNo0ipR+vpxSlEybil1+d MLrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wAI93oYj; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id p10-20020adf9d8a000000b00337187ab2a2si1532262wre.830.2024.01.09.17.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 17:17:48 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wAI93oYj; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 86E368756F; Wed, 10 Jan 2024 02:17:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="wAI93oYj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AEA2587708; Wed, 10 Jan 2024 02:17:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3284987A35 for ; Wed, 10 Jan 2024 02:17:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-205dc844e5eso707921fac.0 for ; Tue, 09 Jan 2024 17:17:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704849422; x=1705454222; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uLu8RNfQOxa+r7scNxZe5YOo/ZxWLLZ6QlPdhb7HAxM=; b=wAI93oYj7/jemcDLwvctcQvttCCpOfM7X/mU33iO9aJTSbMQ9Q6E8D6QN9WPQ1eoet jkx7kiIzNeQekpUpII+jDljZZGWONnxYa133RQInbXIwxOJtFRlSObeFEDZpJYM9hlcq zUl1IpBSslsvum+9b5piMxPYpRSK151klGD2uJ0biwFjO4ueGJnQYHtzX9/lLZUvY2t9 BqRDV55tl9ISWDJXvxiDu5J38Bf2K8tAx2zJmlWAEhtfodFIOIcfRMhRtjQ4UcKb0yIA 3pXLRxwEgkjks11D5ws58boteoLoz6FYOdL0Qi+giIPf/SdV7wsMc1SO1fbr4Y6rILrr yCKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704849422; x=1705454222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uLu8RNfQOxa+r7scNxZe5YOo/ZxWLLZ6QlPdhb7HAxM=; b=bGVqGrUGsk4KoA1En+11zhBQ6On07HZkNdmm7198FcpOrSrJDQKzLCept7oZa2dnGM J+S3maKxXSIuYYngsuOXv5Z5CudJ2u/zWos/n4z+ZxHVbQ4ryJmz4c8nhGRT4U+nlakF ykv5Tb5BasCQB6sYhPi4zFiLSV+/rb7v/WVS8oHXeIKreSqdHDQKPHE+g1aAcigzM1eB EfgURbLgkY/Og7fMs3bnJ0BdV9uue18pVnSXc1n6eIXCuki6PCQNibxCGEP0gfLMT/KN LtxglnQd9MkL42QdT6CHbeTcEiq9NmTPWcWFU56314E1sgChIFU/YsghEjxfPcEBojwY xKJA== X-Gm-Message-State: AOJu0Yw5gM5oWs9iqAEwVlSR4JWDwCJwK4/CU486Yb+rWvovz3I5T1P0 MGlCAmnFhlrpK2QvXOo5fkgjwwftaNvrSQ== X-Received: by 2002:a05:6359:45a0:b0:175:a1c1:d200 with SMTP id no32-20020a05635945a000b00175a1c1d200mr526451rwb.3.1704849422315; Tue, 09 Jan 2024 17:17:02 -0800 (PST) Received: from octopus.. ([2400:4050:c3e1:100:e32c:1ab8:3100:c37f]) by smtp.gmail.com with ESMTPSA id a36-20020a634d24000000b005c2967852c5sm2166833pgb.30.2024.01.09.17.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 17:17:02 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, sjg@chromium.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org Cc: u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v4 4/4] fs: remove explicit efi configuration dependency Date: Wed, 10 Jan 2024 10:16:37 +0900 Message-Id: <20240110011637.174710-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110011637.174710-1-takahiro.akashi@linaro.org> References: <20240110011637.174710-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Now it is clear that the feature actually depends on efi interfaces, not "bootefi" command. efi_set_bootdev() will automatically be nullified if necessary efi component is disabled. Signed-off-by: AKASHI Takahiro Reviewed-by: Simon Glass --- fs/fs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index f1a0b70d1d57..acf465bdd807 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -791,10 +791,9 @@ int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], return 1; } - if (IS_ENABLED(CONFIG_CMD_BOOTEFI)) - efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", - (argc > 4) ? argv[4] : "", map_sysmem(addr, 0), - len_read); + efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", + (argc > 4) ? argv[4] : "", map_sysmem(addr, 0), + len_read); printf("%llu bytes read in %lu ms", len_read, time); if (time > 0) {