[PATCH 1/5] lib: move the global variable guid to lib header

Ivan Hu ivan.hu at canonical.com
Wed Nov 6 09:45:12 UTC 2019


Signed-off-by: Ivan Hu <ivan.hu at canonical.com>
---
 src/lib/include/fwts_uefi.h              | 6 ++++++
 src/uefi/securebootcert/securebootcert.c | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/include/fwts_uefi.h b/src/lib/include/fwts_uefi.h
index 754e00d..418b881 100644
--- a/src/lib/include/fwts_uefi.h
+++ b/src/lib/include/fwts_uefi.h
@@ -26,6 +26,12 @@ PRAGMA_PACK_WARN_OFF
 #define FWTS_UEFI_LOAD_OPTION_ACTIVE 		0x00000001
 #define FWTS_UEFI_LOAD_OPTION_FORCE_RECONNECT 	0x00000002
 
+#define EFI_GLOBAL_VARIABLE \
+{ \
+	0x8BE4DF61, 0x93CA, 0x11d2, { 0xAA, 0x0D, 0x00, \
+						0xE0, 0x98, 0x03, 0x2B, 0x8C} \
+}
+
 typedef struct {
 	uint16_t	*varname;
 	uint8_t		guid[16];
diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c
index 99057cf..14e636e 100644
--- a/src/uefi/securebootcert/securebootcert.c
+++ b/src/uefi/securebootcert/securebootcert.c
@@ -53,12 +53,6 @@ typedef struct _EFI_SIGNATURE_LIST {
 #define VAR_AUDITMODE_FOUND	(1 << 4)
 #define VAR_DEPLOYEDMODE_FOUND	(1 << 5)
 
-#define EFI_GLOBAL_VARIABLE \
-{ \
-	0x8BE4DF61, 0x93CA, 0x11d2, { 0xAA, 0x0D, 0x00, \
-						0xE0, 0x98, 0x03, 0x2B, 0x8C} \
-}
-
 #define EFI_IMAGE_SECURITY_DATABASE_GUID \
 { \
 	0xd719b2cb, 0x3d3a, 0x4596, { 0xa3, 0xbc, 0xda, \
-- 
2.7.4




More information about the fwts-devel mailing list