From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kkq7s-0004QF-PJ for mharc-grub-devel@gnu.org; Thu, 03 Dec 2020 10:02:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkq7o-0004OK-KF for grub-devel@gnu.org; Thu, 03 Dec 2020 10:02:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkq7l-00020T-7R for grub-devel@gnu.org; Thu, 03 Dec 2020 10:02:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607007744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yivAJcS0hKJdvwUCzNeZgSFNJ0ZKDwsVCDwA0IT7TLA=; b=ehFTaQvpoj15oA/A75/ciQHR0VZPEPlDYyIgBn2Who3wJ2ZZf1fF9c5/tWg/33Okqj1nKS ST3pBz1Y63FYHu8Z7an/ciKEhUh22seIL0Puhvmzabv7+FpHdFAuBcBDxrNsUpME1J/PIW 69C8wsiqTblkUWInDMYR5wJt2lrid7g= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-355-tDa4dvGUMBKWFSXwCnCPxQ-1; Thu, 03 Dec 2020 10:02:22 -0500 X-MC-Unique: tDa4dvGUMBKWFSXwCnCPxQ-1 Received: by mail-wm1-f70.google.com with SMTP id n18so1496854wmk.0 for ; Thu, 03 Dec 2020 07:02:22 -0800 (PST) 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=yivAJcS0hKJdvwUCzNeZgSFNJ0ZKDwsVCDwA0IT7TLA=; b=pAbPABwC8EPE8Tds9psoaPpti/CuGGyC5vtI/OS6+XXTswkMnhDG2mTDm+tjd5/fPV xY5gpVT+hI8oXGfAC+sQJxsLlFHe8uBW/pXv9vu2HfkFfL1Mc5/glAWm/Hxl4Ac7tz8/ qvSlp47RI1EB7Ir1RyhjGW/8as/G3DcoRCNDLHjVKkMVViQD6Y/1ttB1t1aSJIj+/yHb NeWLj+MJvRNTBsx+UBVzLnlC0YHIIllmVCz2IGlCTSDS/cdM9ndvCc1aXVTD/yvvCJRB Phn3r/91Dr9oQq7zt+QUmjcjL0AjOtRvW3HBzbMwXiqdXzMJvL0t+pniPdZsG+rxl1QA /bwQ== X-Gm-Message-State: AOAM5330BWeQRaRhjTTo3pkWh50eCo6BJ1rpRXDkUNHFcmrPA9VmDRKN TJVoDGJdI/xnWCjp/9CU8it7y5lnFSTYmM5+KwxHG6cE67cjwe+QD1XsgXtk3mtaqK+k/bevB/5 p26T1H9TJADU37kealng7mIgQNNrv3LRd5EoeUF/Z1Vh5M0ZTGtGz5eHgEvnSLw== X-Received: by 2002:a5d:514f:: with SMTP id u15mr4132162wrt.385.1607007740617; Thu, 03 Dec 2020 07:02:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpZUeDq2w43w3m3YmUlRD/cUFlwR0OrdXJDfDZNHhsc1gEcRCHgdXSRG7coYwYhTKrHrIpFA== X-Received: by 2002:a5d:514f:: with SMTP id u15mr4132124wrt.385.1607007740312; Thu, 03 Dec 2020 07:02:20 -0800 (PST) Received: from minerva.redhat.com ([92.176.231.106]) by smtp.gmail.com with ESMTPSA id n128sm1896759wmb.46.2020.12.03.07.02.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 07:02:19 -0800 (PST) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Ignat Korchagin , Michael Chang , Peter Jones , Marco A Benatto , Leif Lindholm , Daniel Kiper , Javier Martinez Canillas Subject: [PATCH 3/9] arm/term: Fix linking error due multiple ps2_state definitions Date: Thu, 3 Dec 2020 16:01:44 +0100 Message-Id: <20201203150151.848077-4-javierm@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201203150151.848077-1-javierm@redhat.com> References: <20201203150151.848077-1-javierm@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=javierm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=javierm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.495, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2020 15:02:31 -0000 When building with --target=arm-linux-gnu --with-platform=coreboot a linking error occurs caused by multiple definitions of the ps2_state variable. Mark them as static since they aren't used outside their compilation unit. Signed-off-by: Javier Martinez Canillas --- grub-core/term/arm/cros.c | 2 +- grub-core/term/arm/pl050.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/term/arm/cros.c b/grub-core/term/arm/cros.c index 1ff9f8ccfb8..a17e49c325c 100644 --- a/grub-core/term/arm/cros.c +++ b/grub-core/term/arm/cros.c @@ -30,7 +30,7 @@ #include #include -struct grub_ps2_state ps2_state; +static struct grub_ps2_state ps2_state; struct grub_cros_ec_keyscan old_scan; diff --git a/grub-core/term/arm/pl050.c b/grub-core/term/arm/pl050.c index e4cda305666..b082243b032 100644 --- a/grub-core/term/arm/pl050.c +++ b/grub-core/term/arm/pl050.c @@ -29,7 +29,7 @@ static volatile grub_uint32_t *pl050_regs; -struct grub_ps2_state ps2_state; +static struct grub_ps2_state ps2_state; static void keyboard_controller_wait_until_ready (void) -- 2.28.0