[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/9] arm/term: Fix linking error due multiple ps2_state definitio
From: |
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 |
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 <javierm@redhat.com>
---
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 <grub/fdtbus.h>
#include <grub/arm/cros_ec.h>
-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
- [PATCH 0/9] Add UEFI Secure Boot detection and report the status to Linux, Javier Martinez Canillas, 2020/12/03
- [PATCH 1/9] i386: Don't include <grub/cpu/linux.h> in coreboot and ieee1275 startup.S, Javier Martinez Canillas, 2020/12/03
- [PATCH 2/9] include/grub/i386/linux.h: Include missing <grub/types.h> header, Javier Martinez Canillas, 2020/12/03
- [PATCH 3/9] arm/term: Fix linking error due multiple ps2_state definitions,
Javier Martinez Canillas <=
- [PATCH 4/9] efi: Make shim_lock GUID and protocol type public, Javier Martinez Canillas, 2020/12/03
- [PATCH 5/9] efi: Return grub_efi_status_t from grub_efi_get_variable(), Javier Martinez Canillas, 2020/12/03
- [PATCH 6/9] efi: Add a function to read EFI variables with attributes, Javier Martinez Canillas, 2020/12/03
- [PATCH 9/9] loader/linux: Report the UEFI Secure Boot status to the Linux kernel, Javier Martinez Canillas, 2020/12/03
- [PATCH 7/9] efi: Add secure boot detection, Javier Martinez Canillas, 2020/12/03
- [PATCH 8/9] efi: Only register shim_lock verifier if shim_lock protocol is found and SB enabled, Javier Martinez Canillas, 2020/12/03