From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C13F621106FD4 for ; Thu, 7 Jun 2018 23:58:24 -0700 (PDT) Received: by mail-wm0-x241.google.com with SMTP id v131-v6so1586699wma.1 for ; Thu, 07 Jun 2018 23:58:24 -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; bh=rWw+nw28PGMW03a0FZ8OjXh8iNt/MPfEtgEI9RcEVVQ=; b=NYWdR172cmzkoilIGfnweAGQHCMZfzfRoCCwR233e74ht75oNx9Dk53fQZAR27k+22 JUgjsXiXimlxsvfFq3+SD6FHYz/TgogC1aMyhZs1w86jya8NNo/wYMIhN2pyNPkKHBvm ewK+rpbA97B8HJIZyAo0IWYrKBxmiGOyxi7m4= 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; bh=rWw+nw28PGMW03a0FZ8OjXh8iNt/MPfEtgEI9RcEVVQ=; b=qi9CgMIY0vnMqpF87M7AZD/n5HRe5Qpei3yjV8N3zeJ3Y98oIYhiqljgSsFP1E9IHO 6t7R2o01GSwJrTgKXCL+rlS4+iCkxO/Q01SUupGG5jwGbKNnNSumRHhVXLtfvL2Imylw GneMwAwro3wj4BADFe/azO343+ltiAehjiGoleITWNOcr7PU0UAd/UhMrX6ejPQx1baV 1Ef3HPzFCKI+0T4kOZ495zNwvv4SZzKRnbjMOB3fZKIlsbbGBHGSpX83cg1/MVbVf8ID UlK70agKXQRPBrEz+HrCvjNgWxS0p3V3IeEzf5/DJz4A+hPPEp1Xs3TEXzsj/Ekzaz4D ohDA== X-Gm-Message-State: APt69E3rfDx5B12jGFoXiLVPjvapkEo+5b3F/0Xo1TBopTkkIEjp/AFj Ac504ZiDV6guGvaaSFLcIZk2wpIKFWw= X-Google-Smtp-Source: ADUXVKIIguUsCScZhzxkLzmmCkYtEnBJPTqLJ+tiWSSxkMqGoOdy3uL5yyqucgHnoI9Vo7pzAgj4rA== X-Received: by 2002:a1c:8a07:: with SMTP id m7-v6mr669150wmd.27.1528441103143; Thu, 07 Jun 2018 23:58:23 -0700 (PDT) Received: from dogfood.home (LFbn-NIC-1-75-91.w2-15.abo.wanadoo.fr. [2.15.165.91]) by smtp.gmail.com with ESMTPSA id x130-v6sm892491wme.24.2018.06.07.23.58.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 23:58:22 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, star.zeng@intel.com, jiewen.yao@intel.com, michael.d.kinney@intel.com, Ard Biesheuvel Date: Fri, 8 Jun 2018 08:58:10 +0200 Message-Id: <20180608065811.2065-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180608065811.2065-1-ard.biesheuvel@linaro.org> References: <20180608065811.2065-1-ard.biesheuvel@linaro.org> Subject: [PATCH v2 4/5] ArmPkg/PlatformBootManagerLib: call ProcessCapsules() only once X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2018 06:58:25 -0000 ARM platforms have no restriction on when a system firmware update capsule can be applied, and so it is not necessary to call ProcessCapsules() twice. So let's drop the first invocation that occurs before EndOfDxe, so that capsule updates will be applied when the console is up and able to provide progress feedback. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c index 3456a71fbb9c..8e1ecdc01564 100644 --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -553,21 +553,6 @@ PlatformBootManagerBeforeConsole ( VOID ) { - EFI_STATUS Status; - ESRT_MANAGEMENT_PROTOCOL *EsrtManagement; - - if (GetBootModeHob() == BOOT_ON_FLASH_UPDATE) { - DEBUG ((DEBUG_INFO, "ProcessCapsules Before EndOfDxe ......\n")); - Status = ProcessCapsules (); - DEBUG ((DEBUG_INFO, "ProcessCapsules returned %r\n", Status)); - } else { - Status = gBS->LocateProtocol (&gEsrtManagementProtocolGuid, NULL, - (VOID **)&EsrtManagement); - if (!EFI_ERROR (Status)) { - EsrtManagement->SyncEsrtFmp (); - } - } - // // Signal EndOfDxe PI Event // -- 2.17.0