From patchwork Tue Jun 9 05:09:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1305557 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=IIW+mSLx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49gyqw0Kj5z9sRK for ; Tue, 9 Jun 2020 15:10:35 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 195168168F; Tue, 9 Jun 2020 07:10:33 +0200 (CEST) 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="IIW+mSLx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48A1C8168F; Tue, 9 Jun 2020 07:10:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (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 742368168B for ; Tue, 9 Jun 2020 07:10:28 +0200 (CEST) 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-pl1-x643.google.com with SMTP id v24so7562369plo.6 for ; Mon, 08 Jun 2020 22:10:28 -0700 (PDT) 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=tNIuMwXnS4LEF168vO1M54YdqpBEWP67aAzxFlhXlr0=; b=IIW+mSLxb2F1U0R2+QncApdEpo6EuOPVhvHyWRCpS92DcYrq7CGp6b+O4//duAmAz+ MUay4q6X+s9RY88rjiV34y9mXr+cuCMujkA7jp0kgArxPFA7bCiFy7JAOkDAAnEaucZL z0n25AT2qj6/9miK1MXLaZeBc2ymuEjIV+4CRq0M7bBgEE67n9rQkc2ZrzTP7J48wluB 6gvN1DORPiDCUR8WaRHG/q7DaGxIT7mv0gCncAzg/xjETZpG55NX8DMKKuFBN0xgP141 Px/doYPJrVohshc1PbC3DSYhnOPCgNID10XaCUtJ80I/EAwQyzJlv6gfmBJOqsJc2jeT 4K9A== 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=tNIuMwXnS4LEF168vO1M54YdqpBEWP67aAzxFlhXlr0=; b=Ja/shWbK4jY358zpT2jilK53CO0Dlp9qaKv/sSUSBWdIX1qJmHTtSwPJqtIguYF5LC JUalLg7HSdKJwD7Q7vIs725LO50reZzf8a39t2bAcXuuslu+Y9H7EIQSnZRPeV6z+6fL hivQHlT0pZ5qP3D7P/cGOdj0Rwx+rE9sTvvunampVeMfAMg5duqY9fv4E6ZnfGtyex5S bhhPbIwjKUqs+cN+H84PNPgxaePCTDNY9SBmCXfIeRy+oVeBAl/xxxMhvbXlC5srPjZg QoYGQfse5BwxJeEeJBfZz7tbpUcmK5p7OEzqHWfrC2dTnN3EBlXsYpSXHNm1ne5GQjPk XrYg== X-Gm-Message-State: AOAM531c7K4pNhLY3F01Hwgs0dyvQCgTN2fptRsyvoxrcwwcMPNjy9Eo sQHWjED+lTIWq6ADsNuiVB0Ndh5mpmw3hw== X-Google-Smtp-Source: ABdhPJwH0zoiCta5ZmKuue28RmIR3mOHBVx4ly33mDiFdaDDRFYB1sELSe6SL5nKjYUCxmYMm77spA== X-Received: by 2002:a17:90b:a11:: with SMTP id gg17mr2918301pjb.74.1591679427025; Mon, 08 Jun 2020 22:10:27 -0700 (PDT) Received: from localhost.localdomain (p6e421564.tkyea130.ap.so-net.ne.jp. [110.66.21.100]) by smtp.gmail.com with ESMTPSA id p11sm8958611pfq.10.2020.06.08.22.10.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 22:10:26 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de Cc: sughosh.ganu@linaro.org, mail@patrick-wildt.de, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v2 01/17] efi_loader: change efi objects initialization order Date: Tue, 9 Jun 2020 14:09:31 +0900 Message-Id: <20200609050947.17861-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609050947.17861-1-takahiro.akashi@linaro.org> References: <20200609050947.17861-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean The simplest solution to revert the commit b32ac16f9a32 ("test/py: fix test_efi_secboot/conftest.py") is to move efi_console_register() forward before efi_disk_register(). Signed-off-by: AKASHI Takahiro Reviewed-by: Heinrich Schuchardt --- lib/efi_loader/efi_setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index dd0c53fc2399..671f6da12b30 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -140,6 +140,10 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; + ret = efi_console_register(); + if (ret != EFI_SUCCESS) + goto out; + #ifdef CONFIG_PARTITIONS ret = efi_disk_register(); if (ret != EFI_SUCCESS) @@ -185,9 +189,6 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; - ret = efi_console_register(); - if (ret != EFI_SUCCESS) - goto out; #if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) ret = efi_gop_register(); if (ret != EFI_SUCCESS)