From: Vladimir Serbinenko <phcoder@gmail.com>
To: grub-devel@gnu.org
Cc: Vladimir Serbinenko <phcoder@gmail.com>
Subject: [PATCH 6/6] gentpl: Put startup_raw.S into beginning of the image
Date: Mon, 2 Sep 2024 03:22:54 +0300 [thread overview]
Message-ID: <20240902002254.1008-6-phcoder@gmail.com> (raw)
In-Reply-To: <20240902002254.1008-1-phcoder@gmail.com>
Otherwise it breaks the decompressors for mips platforms
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
---
gentpl.py | 4 ++--
grub-core/Makefile.core.def | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gentpl.py b/gentpl.py
index 3b12eca6c..d8c6965d8 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -634,7 +634,7 @@ def extra_dist(defn):
def extra_dep(defn):
return foreach_value(defn, "depends", lambda value: value + " ")
-def platform_sources(defn, p): return platform_values(defn, p, "")
+def platform_sources(defn, p): return platform_values(defn, p, "_head") + platform_values(defn, p, "")
def platform_nodist_sources(defn, p): return platform_values(defn, p, "_nodist")
def platform_startup(defn, p): return platform_specific_values(defn, p, "_startup", "startup")
@@ -660,7 +660,7 @@ def first_time(defn, snippet):
def is_platform_independent(defn):
if 'enable' in defn:
return False
- for suffix in [ "", "_nodist" ]:
+ for suffix in [ "", "_head", "_nodist" ]:
template = platform_values(defn, GRUB_PLATFORMS[0], suffix)
for platform in GRUB_PLATFORMS[1:]:
if template != platform_values(defn, platform, suffix):
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 705d73fab..063ef5dd7 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -536,7 +536,7 @@ image = {
image = {
name = xz_decompress;
- mips = boot/mips/startup_raw.S;
+ mips_head = boot/mips/startup_raw.S;
common = boot/decompressor/minilib.c;
common = boot/decompressor/xz.c;
common = lib/xzembed/xz_dec_bcj.c;
@@ -554,7 +554,7 @@ image = {
image = {
name = none_decompress;
- mips = boot/mips/startup_raw.S;
+ mips_head = boot/mips/startup_raw.S;
common = boot/decompressor/none.c;
cppflags = '-DGRUB_EMBED_DECOMPRESSOR=1';
--
2.39.2
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
prev parent reply other threads:[~2024-09-02 0:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-02 0:22 [PATCH 1/6] configure: Look for .otf fonts Vladimir Serbinenko
2024-09-02 0:22 ` [PATCH 2/6] erofs: Replace 64-bit modulo with bitwise operations Vladimir Serbinenko
2024-09-02 3:41 ` Gao Xiang
2024-09-02 0:22 ` [PATCH 3/6] xzembed: Silence warning when no BCJ is available Vladimir Serbinenko
2024-09-02 0:22 ` [PATCH 4/6] configure: Add -mno-gpopt option Vladimir Serbinenko
2024-09-02 0:22 ` [PATCH 5/6] mkimage: Fix section_align for Loongson Vladimir Serbinenko
2024-09-02 0:22 ` Vladimir Serbinenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240902002254.1008-6-phcoder@gmail.com \
--to=phcoder@gmail.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.