From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9D11921A13499 for ; Thu, 18 May 2017 10:32:27 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP; 18 May 2017 10:32:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,359,1491289200"; d="scan'208";a="104147565" Received: from mdkinney-mobl.amr.corp.intel.com ([10.254.56.31]) by fmsmga006.fm.intel.com with ESMTP; 18 May 2017 10:32:27 -0700 From: Michael Kinney To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong , Andrew Fish Date: Thu, 18 May 2017 10:32:24 -0700 Message-Id: <1495128744-24324-1-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 Subject: [Patch] MdeModulePkg/LogoDxe: Return error if HII Package not present X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 May 2017 17:32:28 -0000 https://bugzilla.tianocore.org/show_bug.cgi?id=554 Update LogoDxe module to exit with an error instead of ASSERT_EFI_ERROR() if the HII Package with the logo image is not present. If a tool chain does not support generation of PE/COFF resource sections, then this module can not produce the logo from an HII Image Package. XCODE5 is an example of a tool chain that does not currently support generation of PE/COFF resource sections. Cc: Star Zeng Cc: Eric Dong Cc: Andrew Fish Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney --- MdeModulePkg/Logo/Logo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Logo/Logo.c b/MdeModulePkg/Logo/Logo.c index 313dd4a..b34724a 100644 --- a/MdeModulePkg/Logo/Logo.c +++ b/MdeModulePkg/Logo/Logo.c @@ -1,7 +1,7 @@ /** @file Logo DXE Driver, install Edkii Platform Logo protocol. -Copyright (c) 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -133,7 +133,9 @@ InitializeLogo ( NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL ); - ASSERT_EFI_ERROR (Status); + if (EFI_ERROR (Status)) { + return Status; + } // // Publish HII package list to HII Database. -- 2.6.3.windows.1