shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-05 16:22:27 +03:00
Code Activity

boot: Add RISCV32 and LoongArch support

Browse Source 
This is completely untested, but should work in theory, as it's just
adding a couple defines according to the specs.
This commit is contained in:
Jan Janssen
2023-02-28 18:05:18 +01:00
parent c4ad9b23ca
commit 31ffb6b183
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -1960,11 +1960,14 @@ python_39 = python.language_version().version_compare('>=3.9')
##################################################################### #####################################################################
efi_arch = { efi_arch = {
'aarch64' : 'aa64', 'aarch64' : 'aa64',
'arm' : 'arm', 'arm' : 'arm',
'riscv64' : 'riscv64', 'loongarch32' : 'loongarch32',
'x86_64' : 'x64', 'loongarch64' : 'loongarch64',
'x86' : 'ia32', 'riscv32' : 'riscv32',
'riscv64' : 'riscv64',
'x86_64' : 'x64',
'x86' : 'ia32',
}.get(host_machine.cpu_family(), '') }.get(host_machine.cpu_family(), '')
if get_option('bootloader') != 'false' and efi_arch != '' if get_option('bootloader') != 'false' and efi_arch != ''

6
src/boot/efi/pe.c
View File

@ -16,8 +16,14 @@
# define TARGET_MACHINE_TYPE 0xAA64U # define TARGET_MACHINE_TYPE 0xAA64U
#elif defined(__arm__) #elif defined(__arm__)
# define TARGET_MACHINE_TYPE 0x01C2U # define TARGET_MACHINE_TYPE 0x01C2U
#elif defined(__riscv) && __riscv_xlen == 32
# define TARGET_MACHINE_TYPE 0x5032U
#elif defined(__riscv) && __riscv_xlen == 64 #elif defined(__riscv) && __riscv_xlen == 64
# define TARGET_MACHINE_TYPE 0x5064U # define TARGET_MACHINE_TYPE 0x5064U
#elif defined(__loongarch__) && __loongarch_grlen == 32
# define TARGET_MACHINE_TYPE 0x6232U
#elif defined(__loongarch__) && __loongarch_grlen == 64
# define TARGET_MACHINE_TYPE 0x6264U
#else #else
# error Unknown EFI arch # error Unknown EFI arch
#endif #endif

5
tools/elf2efi.py
View File

@ -336,6 +336,7 @@ def convert_elf_reloc_table(
"EM_386": ENUM_RELOC_TYPE_i386["R_386_NONE"], "EM_386": ENUM_RELOC_TYPE_i386["R_386_NONE"],
"EM_AARCH64": ENUM_RELOC_TYPE_AARCH64["R_AARCH64_NONE"], "EM_AARCH64": ENUM_RELOC_TYPE_AARCH64["R_AARCH64_NONE"],
"EM_ARM": ENUM_RELOC_TYPE_ARM["R_ARM_NONE"], "EM_ARM": ENUM_RELOC_TYPE_ARM["R_ARM_NONE"],
"EM_LOONGARCH": 0,
"EM_RISCV": 0, "EM_RISCV": 0,
"EM_X86_64": ENUM_RELOC_TYPE_x64["R_X86_64_NONE"], "EM_X86_64": ENUM_RELOC_TYPE_x64["R_X86_64_NONE"],
}[elf["e_machine"]] }[elf["e_machine"]]
@ -344,6 +345,7 @@ def convert_elf_reloc_table(
"EM_386": ENUM_RELOC_TYPE_i386["R_386_RELATIVE"], "EM_386": ENUM_RELOC_TYPE_i386["R_386_RELATIVE"],
"EM_AARCH64": ENUM_RELOC_TYPE_AARCH64["R_AARCH64_RELATIVE"], "EM_AARCH64": ENUM_RELOC_TYPE_AARCH64["R_AARCH64_RELATIVE"],
"EM_ARM": ENUM_RELOC_TYPE_ARM["R_ARM_RELATIVE"], "EM_ARM": ENUM_RELOC_TYPE_ARM["R_ARM_RELATIVE"],
"EM_LOONGARCH": 3,
"EM_RISCV": 3, "EM_RISCV": 3,
"EM_X86_64": ENUM_RELOC_TYPE_x64["R_X86_64_RELATIVE"], "EM_X86_64": ENUM_RELOC_TYPE_x64["R_X86_64_RELATIVE"],
}[elf["e_machine"]] }[elf["e_machine"]]
@ -465,7 +467,8 @@ def elf2efi(args: argparse.Namespace):
"EM_386": 0x014C, "EM_386": 0x014C,
"EM_AARCH64": 0xAA64, "EM_AARCH64": 0xAA64,
"EM_ARM": 0x01C2, "EM_ARM": 0x01C2,
"EM_RISCV": 0x5064, "EM_LOONGARCH": 0x6232 if elf.elfclass == 32 else 0x6264,
"EM_RISCV": 0x5032 if elf.elfclass == 32 else 0x5064,
"EM_X86_64": 0x8664, "EM_X86_64": 0x8664,
}.get(elf["e_machine"]) }.get(elf["e_machine"])
if pe_arch is None: if pe_arch is None: