tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gentpl: Put boot/mips/startup_raw.S into beginning of the image

Browse Source 
Otherwise it breaks the decompressors for MIPS targets.

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Vladimir Serbinenko 2024-09-03 20:58:50 +03:00 committed by Daniel Kiper
parent 648f2d16c0
commit ed06516738
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gentpl.py
View File

@ -634,7 +634,7 @@ def extra_dist(defn):
def extra_dep(defn): def extra_dep(defn):
return foreach_value(defn, "depends", lambda value: value + " ") 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_nodist_sources(defn, p): return platform_values(defn, p, "_nodist")
def platform_startup(defn, p): return platform_specific_values(defn, p, "_startup", "startup") 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): def is_platform_independent(defn):
if 'enable' in defn: if 'enable' in defn:
return False return False
for suffix in [ "", "_nodist" ]: for suffix in [ "", "_head", "_nodist" ]:
template = platform_values(defn, GRUB_PLATFORMS[0], suffix) template = platform_values(defn, GRUB_PLATFORMS[0], suffix)
for platform in GRUB_PLATFORMS[1:]: for platform in GRUB_PLATFORMS[1:]:
if template != platform_values(defn, platform, suffix): if template != platform_values(defn, platform, suffix):

4
grub-core/Makefile.core.def
View File

@ -536,7 +536,7 @@ image = {
image = { image = {
name = xz_decompress; name = xz_decompress;
mips = boot/mips/startup_raw.S; mips_head = boot/mips/startup_raw.S;
common = boot/decompressor/minilib.c; common = boot/decompressor/minilib.c;
common = boot/decompressor/xz.c; common = boot/decompressor/xz.c;
common = lib/xzembed/xz_dec_bcj.c; common = lib/xzembed/xz_dec_bcj.c;
@ -554,7 +554,7 @@ image = {
image = { image = {
name = none_decompress; name = none_decompress;
mips = boot/mips/startup_raw.S; mips_head = boot/mips/startup_raw.S;
common = boot/decompressor/none.c; common = boot/decompressor/none.c;
cppflags = '-DGRUB_EMBED_DECOMPRESSOR=1'; cppflags = '-DGRUB_EMBED_DECOMPRESSOR=1';