vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update bootloader, remove bootloader-efi

Browse source
This commit is contained in:
Jeremy Soller 2022-02-08 14:17:39 -07:00
parent c4bf3a9956
commit b0958d492f
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
4 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -2,10 +2,6 @@
path = bootloader path = bootloader
url = https://gitlab.redox-os.org/redox-os/bootloader.git url = https://gitlab.redox-os.org/redox-os/bootloader.git
branch = master branch = master
[submodule "bootloader-efi"]
path = bootloader-efi
url = https://gitlab.redox-os.org/redox-os/bootloader-efi.git
branch = master
[submodule "cookbook"] [submodule "cookbook"]
path = cookbook path = cookbook
url = https://gitlab.redox-os.org/redox-os/cookbook.git url = https://gitlab.redox-os.org/redox-os/cookbook.git

2
bootloader

@ -1 +1 @@
Subproject commit 5de0a9076bfd5d84c26183ac9fe0372df84137fa Subproject commit 8c7bb57ef3e546f828ba8324b2e566dad0b7cf74

1
bootloader-efi

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

16
mk/bootloader.mk
View file

@ -6,6 +6,14 @@ build/bootloader.bin: bootloader/build/$(BOOTLOADER_TARGET)/bootloader.bin
mkdir -p build mkdir -p build
cp -v $< $@ cp -v $< $@
bootloader/build/$(EFI_TARGET)/bootloader.efi: FORCE
env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
$(MAKE) -C bootloader build/$(EFI_TARGET)/bootloader.efi TARGET=$(EFI_TARGET)
build/bootloader.efi: bootloader/build/$(EFI_TARGET)/bootloader.efi
mkdir -p build
cp -v $< $@
bootloader-coreboot/build/bootloader: build/kernel_coreboot bootloader-coreboot/build/bootloader: build/kernel_coreboot
env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \ env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
$(MAKE) -C bootloader-coreboot clean build/bootloader KERNEL="$(ROOT)/$<" $(MAKE) -C bootloader-coreboot clean build/bootloader KERNEL="$(ROOT)/$<"
@ -13,11 +21,3 @@ bootloader-coreboot/build/bootloader: build/kernel_coreboot
build/coreboot.elf: bootloader-coreboot/build/bootloader build/coreboot.elf: bootloader-coreboot/build/bootloader
mkdir -p build mkdir -p build
cp -v $< $@ cp -v $< $@
bootloader-efi/build/$(EFI_TARGET)/boot.efi: FORCE
env --unset=RUST_TARGET_PATH --unset=RUSTUP_TOOLCHAIN --unset=XARGO_RUST_SRC \
$(MAKE) -C bootloader-efi build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET)
build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi
mkdir -p build
cp -v $< $@