mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-01-10 17:19:57 +00:00
581d4a66ac
remove nvme support from the "default" grub tree now there are three trees: * default: no xhci or nvme patches * nvme: contains nvme support * xhci: contains xhci and nvme support this is in case a bug like lbmk issue #216 ever occurs again, as referenced before during lbmk audit 5 there is no indication that the nvme patch causes any issues, but after previous experience i want to be sure Signed-off-by: Leah Rowe <leah@libreboot.org>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 9edaaffac91d593a439e44bac3b6f5558f5a8245 Mon Sep 17 00:00:00 2001
|
|
From: Ax333l <main@axelen.xyz>
|
|
Date: Thu, 17 Aug 2023 00:00:00 +0000
|
|
Subject: [PATCH 2/6] Define GRUB_UINT32_MAX
|
|
|
|
Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
|
|
---
|
|
include/grub/types.h | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/include/grub/types.h b/include/grub/types.h
|
|
index 0d96006fe..a13f3a60b 100644
|
|
--- a/include/grub/types.h
|
|
+++ b/include/grub/types.h
|
|
@@ -156,6 +156,7 @@ typedef grub_int32_t grub_ssize_t;
|
|
#define GRUB_SHRT_MAX 0x7fff
|
|
#define GRUB_SHRT_MIN (-GRUB_SHRT_MAX - 1)
|
|
#define GRUB_UINT_MAX 4294967295U
|
|
+#define GRUB_UINT32_MAX 4294967295U
|
|
#define GRUB_INT_MAX 0x7fffffff
|
|
#define GRUB_INT_MIN (-GRUB_INT_MAX - 1)
|
|
#define GRUB_INT32_MAX 2147483647
|
|
@@ -177,6 +178,13 @@ typedef grub_int32_t grub_ssize_t;
|
|
#define GRUB_TYPE_U_MAX(type) ((unsigned long long)((typeof (type))(~0)))
|
|
#define GRUB_TYPE_U_MIN(type) 0ULL
|
|
|
|
+# define GRUB_UINT32_C(x) x ## U
|
|
+# if GRUB_ULONG_MAX >> 31 >> 31 >> 1 == 1
|
|
+# define GRUB_UINT64_C(x) x##UL
|
|
+# elif 1
|
|
+# define GRUB_UINT64_C(x) x##ULL
|
|
+# endif
|
|
+
|
|
typedef grub_uint64_t grub_properly_aligned_t;
|
|
|
|
#define GRUB_PROPERLY_ALIGNED_ARRAY(name, size) grub_properly_aligned_t name[((size) + sizeof (grub_properly_aligned_t) - 1) / sizeof (grub_properly_aligned_t)]
|
|
--
|
|
2.39.2
|
|
|