bootloader: remove use/botloader/uboot

u-boot is a low-level bootloader, which, although it can load the kernel and initrd directly via extlinux.conf, increasingly provides UEFI. Therefore, there is no point in isolating it as a separate bootloader. It is enough to disable EFI_BOOTLADER so that extlinux.conf has priority.

bootloader: remove use/botloader/uboot
b78eaed7 · Anton Midyukov · 97361c94 · b78eaed7 · b78eaed7
Commit b78eaed7 authored Apr 29, 2025 by Anton Midyukov
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

mixin.mk conf.d/mixin.mk +1 -1

config.mk features.in/bootloader/config.mk +0 -3

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -35,7 +35,7 @@ mixin/vm-archdep: use/auto-resize use/uboot use/arm-rpi4 +efi

 mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @:

-mixin/uboot-extlinux: use/bootloader/uboot
+mixin/uboot-extlinux: use/uboot
 	@$(call set,EFI_BOOTLOADER,)

 mixin/uboot-extlinux-efi: use/uboot +efi; @:

--- a/features.in/bootloader/config.mk
+++ b/features.in/bootloader/config.mk
@@ -30,9 +30,6 @@ else
 use/bootloader/grub: ; @:
 endif

-use/bootloader/uboot: use/bootloader use/uboot
-	@$(call set,BASE_BOOTLOADER,uboot)
-
 use/bootloader/live: use/bootloader; @:
 ifneq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,LIVE_PACKAGES,alterator-$$(BASE_BOOTLOADER))