mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-01-10 17:19:57 +00:00
eb4ac3c334
The xHCI patches were removed because they caused issues on Sandybridge-based Dell Latitude laptops. See: https://codeberg.org/libreboot/lbmk/issues/216 The issue was not reported elsewhere, but we still don't need xHCI support in Canoeboot's GRUB because none of the available coreboot targets have xHCI support. However, we may want it in the future and it helps to keep Canoeboot in sync with Libreboot (this patch is adapted from lbmk). Each given coreboot target can say which GRUB tree to use by setting this in target.cfg: grubtree="xhci" In the above example, the "xhci" tree would be used. Some generic GRUB config has been moved to config/data/grub/ and config/grub/ now looks like config/coreboot/ - also, the grub.cfg file (named "payload" in each tree) is copied to the GRUB source tree as ".config", then added to GRUB's memdisk in the same way, as grub.cfg. Several other design changes had to be made because of this: * grub.cfg in memdisk no longer automatically jumps to one in CBFS, but now shows a menuentry for it if available * Certain commands in script/trees are disabled for GRUB, such as *config make commands. * gnulib is now defined in config/submodule/grub/, instead of config/git/grub - and this mitigates an existing bug where downloading gnulib first would make grub no longer possible to download in lbmk. There is another reason for merging this design change from lbmk, and that reasoning also applies to lbmk. Specifically: This change will enable per-board GRUB optimisation in the future. For example, we hardcode what partitions and LVMs GRUB scans because * is slow on ICH7-based machines, due to GRUB's design. On other machines, * is reasonably fast, for automatically enumerating the list of devices for boot. Use of * (and other wildcards) could enable our GRUB payload to automatically boot more distros, with minimal fuss. This can be done at a later date, in subsequent revisions. 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
|
|
|