Update M2libc with UEFI changes and build initial M2-Planet and M1.

This commit is contained in:
Andrius Štikonas 2022-10-26 23:09:37 +01:00
parent e5453f203a
commit df9c276d81
6 changed files with 20 additions and 7 deletions

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "M2-Planet"]
path = M2-Planet
url = https://github.com/oriansj/M2-Planet
[submodule "mescc-tools"]
path = mescc-tools
url = https://github.com/oriansj/mescc-tools/

View File

@ -56,8 +56,8 @@ struct efi_boot_table
// Image Services
efi_status_t (*load_image)(uint8_t, efi_handle_t, struct efi_device_path_protocol*, void *, efi_uint_t, efi_handle_t);
efi_status_t (*start_image)(efi_handle_t, efi_uint_t *, uint16_t);
void (*unused23)();
efi_status_t (*exit)(efi_handle_t, efi_status_t, uint16_t);
void (*unused23)();
efi_status_t (*exit_boot_services)(efi_handle_t, efi_uint_t);
// Miscellaneous Services

@ -1 +1 @@
Subproject commit f7fcc0af6ed466cc243ed78d76476fd0f4d16dea
Subproject commit b8664784b6a24e07173bef962542fd7066d33c44

2
M2libc

@ -1 +1 @@
Subproject commit f73e5899bb3eb7683ec27cf564775c4577640bdc
Subproject commit 215859a120bee867795319d2e8ccbe61ac450205

View File

@ -45,9 +45,18 @@ amd64\artifact\hex2-0.efi amd64\artifact\cc_amd64-0.hex2 amd64\artifact\cc_amd64
#########################################
# Phase-5 Build M2-Planet from cc_amd64 #
#########################################
amd64\artifact\catm.efi amd64\artifact\M2-0.c M2libc\amd64\linux\bootstrap.c M2-Planet\cc.h M2libc\bootstrappable.c M2-Planet\cc_globals.c M2-Planet\cc_reader.c M2-Planet\cc_strings.c M2-Planet\cc_types.c M2-Planet\cc_core.c M2-Planet\cc_macro.c M2-Planet\cc.c
amd64\artifact\catm.efi amd64\artifact\M2-0.c M2libc\amd64\uefi\bootstrap.c M2-Planet\cc.h M2libc\bootstrappable.c M2-Planet\cc_globals.c M2-Planet\cc_reader.c M2-Planet\cc_strings.c M2-Planet\cc_types.c M2-Planet\cc_core.c M2-Planet\cc_macro.c M2-Planet\cc.c
amd64\artifact\cc_amd64.efi amd64\artifact\M2-0.c amd64\artifact\M2-0.M1
amd64\artifact\catm.efi amd64\artifact\M2-0-0.M1 M2libc\amd64\amd64_defs.M1 M2libc\amd64\libc-core.M1 amd64\artifact\M2-0.M1
amd64\artifact\catm.efi amd64\artifact\M2-0-0.M1 M2libc\amd64\amd64_defs.M1 M2libc\amd64\uefi\libc-core.M1 amd64\artifact\M2-0.M1
amd64\artifact\M0.efi amd64\artifact\M2-0-0.M1 amd64\artifact\M2-0.hex2
amd64\artifact\catm.efi amd64\artifact\M2-0-0.hex2 M2libc\amd64\ELF-amd64.hex2 amd64\artifact\M2-0.hex2
amd64\artifact\hex2-0.efi amd64\artifact\M2-0-0.hex2 amd64\artifact\M2
amd64\artifact\catm.efi amd64\artifact\M2-0-0.hex2 amd64\PE32-amd64.hex2 amd64\artifact\M2-0.hex2
amd64\artifact\hex2-0.efi amd64\artifact\M2-0-0.hex2 amd64\artifact\M2.efi
#####################################
# Phase-6 Build M1-0 from C sources #
#####################################
amd64\artifact\M2.efi --architecture amd64 -f M2libc\amd64\uefi\bootstrap.c -f M2libc\bootstrappable.c -f mescc-tools\stringify.c -f mescc-tools\M1-macro.c --bootstrap-mode -o amd64\artifact\M1-macro-0.M1
amd64\artifact\catm.efi amd64\artifact\M1-macro-0-0.M1 M2libc\amd64\amd64_defs.M1 M2libc\amd64\uefi\libc-core.M1 amd64\artifact\M1-macro-0.M1
amd64\artifact\M0.efi amd64\artifact\M1-macro-0-0.M1 amd64\artifact\M1-macro-0.hex2
amd64\artifact\catm.efi amd64\artifact\M1-macro-0-0.hex2 M2libc\amd64\uefi\PE32-amd64.hex2 amd64\artifact\M1-macro-0.hex2
amd64\artifact\hex2-0.efi amd64\artifact\M1-macro-0-0.hex2 amd64\artifact\M1-0.efi

1
mescc-tools Submodule

@ -0,0 +1 @@
Subproject commit 0aeb341af469e124607c3cc44dab04943efc41ac