From patchwork Wed Jul 23 00:23:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 34119 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 387B820672 for ; Wed, 23 Jul 2014 00:24:12 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf1689540yha.3 for ; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:reply-to:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=HnZyAYAODMOaleJCA/UblucTMqzgU6cJ27jEQaqDJmI=; b=EnGl2xFPQK8SDVQgPKRL5owGnLTUBAxEi6hYakqPJMOCXpK495fXarvO5qgCryqdMX rBNPBXkEWOaejxpuwVtPDRllZn9WLSuDUD1RwSxeeEx9/82uiQsdSCv3Z6uZ498NflZ3 Q7H6K6WS45qtmwf8wMERZpgtWHjmg8+g0imUvRAmGEFL1eWTpuiVn0a1eaJSL0z/aDV4 UQKfmmr3yKl4TXF2MUKQcgy+awvCAbE8OjdUH9vcfTikH6OGSkTD7bvGFvuxvcIvVrz1 SVNtWBnnNrpzWxweGFjc2ettTOAqD/78fNct0WB3za7tVgZgPxAdq2RBAIQzMTewlDeq vlGg== X-Gm-Message-State: ALoCoQncufoPwMB8A8ImSH7fbWryzfUkxJpbx6jtGa8b3tz28x0sUAwPQmOXpEFNjfMP0ZuuK64p X-Received: by 10.236.101.148 with SMTP id b20mr15724044yhg.46.1406075051622; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.44 with SMTP id k41ls116131qgk.78.gmail; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) X-Received: by 10.221.38.129 with SMTP id ti1mr34185687vcb.9.1406075051497; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id da7si598985vec.28.2014.07.22.17.24.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 17:24:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so797220vcb.22 for ; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) X-Received: by 10.53.5.230 with SMTP id cp6mr2539598vdd.25.1406075051356; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp237194vcb; Tue, 22 Jul 2014 17:24:11 -0700 (PDT) X-Received: by 10.42.216.143 with SMTP id hi15mr40340939icb.12.1406075050802; Tue, 22 Jul 2014 17:24:10 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id g8si1347139ica.90.2014.07.22.17.24.09 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 22 Jul 2014 17:24:10 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1X9kLf-0000GN-7T; Wed, 23 Jul 2014 00:23:59 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1X9kLd-0000GH-S6 for edk2-devel@lists.sourceforge.net; Wed, 23 Jul 2014 00:23:57 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=lersek@redhat.com; helo=mx1.redhat.com; Received: from mx1.redhat.com ([209.132.183.28]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1X9kLc-0005gU-5V for edk2-devel@lists.sourceforge.net; Wed, 23 Jul 2014 00:23:57 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6N0NnrR002947 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Jul 2014 20:23:49 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-20.ams2.redhat.com [10.36.116.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6N0NmXU024507 for ; Tue, 22 Jul 2014 20:23:48 -0400 From: Laszlo Ersek To: edk2-devel@lists.sourceforge.net Date: Wed, 23 Jul 2014 02:23:46 +0200 Message-Id: <1406075026-24285-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1X9kLc-0005gU-5V Subject: [edk2] [PATCH] OvmfPkg/Csm/CsmSupportLib: fix "missing braces around initializer" X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Recent BaseTools changes trigger this gcc warning. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen --- OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c index af8896a..867b128 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c @@ -30,10 +30,10 @@ EFI_SETUP_BBS_MAP mSetupBbsMap[] = { // Global variables for System ROMs // #define SYSTEM_ROM_FILE_GUID \ -{ 0x1547B4F3, 0x3E8A, 0x4FEF, 0x81, 0xC8, 0x32, 0x8E, 0xD6, 0x47, 0xAB, 0x1A } +{ 0x1547B4F3, 0x3E8A, 0x4FEF, { 0x81, 0xC8, 0x32, 0x8E, 0xD6, 0x47, 0xAB, 0x1A } } #define NULL_ROM_FILE_GUID \ -{ 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } +{ 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } SYSTEM_ROM_TABLE mSystemRomTable[] = { { SYSTEM_ROM_FILE_GUID, 1 }, @@ -82,12 +82,12 @@ EFI_LEGACY_PIRQ_TABLE PirqTableHead = { // -- Pin 1 -- -- Pin 2 -- -- Pin 3 -- -- Pin 4 -- // Bus Dev Reg Map Reg Map Reg Map Reg Map - 0x00,0x08,0x60,0xDEB8,0x61,0xDEB8,0x62,0xDEB8,0x63,0xDEB8,0x00,0x00, - 0x00,0x10,0x61,0xDEB8,0x62,0xDEB8,0x63,0xDEB8,0x60,0xDEB8,0x01,0x00, - 0x00,0x18,0x62,0xDEB8,0x63,0xDEB8,0x60,0xDEB8,0x61,0xDEB8,0x02,0x00, - 0x00,0x20,0x63,0xDEB8,0x60,0xDEB8,0x61,0xDEB8,0x62,0xDEB8,0x03,0x00, - 0x00,0x28,0x60,0xDEB8,0x61,0xDEB8,0x62,0xDEB8,0x63,0xDEB8,0x04,0x00, - 0x00,0x30,0x61,0xDEB8,0x62,0xDEB8,0x63,0xDEB8,0x60,0xDEB8,0x05,0x00, + {0x00,0x08,{{0x60,0xDEB8},{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8}},0x00,0x00}, + {0x00,0x10,{{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8},{0x60,0xDEB8}},0x01,0x00}, + {0x00,0x18,{{0x62,0xDEB8},{0x63,0xDEB8},{0x60,0xDEB8},{0x61,0xDEB8}},0x02,0x00}, + {0x00,0x20,{{0x63,0xDEB8},{0x60,0xDEB8},{0x61,0xDEB8},{0x62,0xDEB8}},0x03,0x00}, + {0x00,0x28,{{0x60,0xDEB8},{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8}},0x04,0x00}, + {0x00,0x30,{{0x61,0xDEB8},{0x62,0xDEB8},{0x63,0xDEB8},{0x60,0xDEB8}},0x05,0x00}, } };