diff --git a/GNUmakefile.in b/GNUmakefile.in index 97271f70..5fd37872 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -42,7 +42,7 @@ override BUILD_UEFI_IA32 := @BUILD_UEFI_IA32@ override BUILD_UEFI_AARCH64 := @BUILD_UEFI_AARCH64@ override BUILD_UEFI_RISCV64 := @BUILD_UEFI_RISCV64@ override BUILD_CD_EFI := @BUILD_CD_EFI@ -override BUILD_PXE := @BUILD_PXE@ +override BUILD_BIOS_PXE := @BUILD_BIOS_PXE@ override BUILD_CD := @BUILD_CD@ override DEFAULT_CC := @CC@ @@ -156,8 +156,8 @@ endif ifneq ($(BUILD_CD_EFI),no) $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' endif -ifneq ($(BUILD_PXE),no) - $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-pxe.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' +ifneq ($(BUILD_BIOS_PXE),no) + $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-bios-pxe.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' endif ifeq ($(BUILD_UEFI_AARCH64),limine-uefi-aarch64) $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/BOOTAA64.EFI' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' @@ -198,8 +198,8 @@ $(call MKESCAPE,$(BUILDDIR))/stage1.stamp: $(STAGE1_FILES) $(call MKESCAPE,$(BUI ifneq ($(BUILD_CD),no) cd '$(call SHESCAPE,$(SRCDIR))/stage1/cd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-cd.bin' endif -ifneq ($(BUILD_PXE),no) - cd '$(call SHESCAPE,$(SRCDIR))/stage1/pxe' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-pxe.bin' +ifneq ($(BUILD_BIOS_PXE),no) + cd '$(call SHESCAPE,$(SRCDIR))/stage1/pxe' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-pxe.bin' endif cp '$(call SHESCAPE,$(BUILDDIR))/common-bios/limine.sys' '$(call SHESCAPE,$(BINDIR))/' touch '$(call SHESCAPE,$(BUILDDIR))/stage1.stamp' diff --git a/README.md b/README.md index d290a449..54f8e904 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ For example, if it was copied in `boot/limine-cd-efi.bin`. ### BIOS/PXE boot -The `limine-pxe.bin` binary is a valid PXE boot image. +The `limine-bios-pxe.bin` binary is a valid PXE boot image. In order to boot Limine from PXE it is necessary to setup a DHCP server with support for PXE booting. This can either be accomplished using a single DHCP server or your existing DHCP server and a proxy DHCP server such as dnsmasq. diff --git a/configure.ac b/configure.ac index 2548d59c..a6e0eced 100644 --- a/configure.ac +++ b/configure.ac @@ -77,13 +77,13 @@ AC_ARG_ENABLE([bios-cd], AC_SUBST([BUILD_CD]) -BUILD_PXE="$BUILD_ALL" +BUILD_BIOS_PXE="$BUILD_ALL" AC_ARG_ENABLE([bios-pxe], [AS_HELP_STRING([--enable-bios-pxe], [enable building the x86 BIOS PXE image])], - [BUILD_PXE="$enableval"]) + [BUILD_BIOS_PXE="$enableval"]) -AC_SUBST([BUILD_PXE]) +AC_SUBST([BUILD_BIOS_PXE]) BUILD_BIOS="$BUILD_ALL" @@ -95,7 +95,7 @@ if test "x$BUILD_BIOS" = "xno"; then if test "x$BUILD_CD" = "xyes"; then BUILD_BIOS="yes" fi - if test "x$BUILD_PXE" = "xyes"; then + if test "x$BUILD_BIOS_PXE" = "xyes"; then BUILD_BIOS="yes" fi fi diff --git a/host/Makefile b/host/Makefile index e0507141..0c7fb43d 100644 --- a/host/Makefile +++ b/host/Makefile @@ -16,7 +16,7 @@ install: all $(INSTALL) -m 644 limine.sys '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 limine-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 limine-cd-efi.bin '$(DESTDIR)$(PREFIX)/share/limine/' - $(INSTALL) -m 644 limine-pxe.bin '$(DESTDIR)$(PREFIX)/share/limine/' + $(INSTALL) -m 644 limine-bios-pxe.bin '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 BOOTX64.EFI '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 BOOTIA32.EFI '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -d '$(DESTDIR)$(PREFIX)/include' diff --git a/test.mk b/test.mk index 434ba830..e13fda41 100644 --- a/test.mk +++ b/test.mk @@ -190,7 +190,7 @@ pxe-test: $(MKDIR_P) test_image/boot sudo cp -rv $(BINDIR)/* test_image/boot/ sudo cp -rv test/* test_image/boot/ - qemu-system-x86_64 -smp 4 -netdev user,id=n0,tftp=./test_image,bootfile=boot/limine-pxe.bin -device rtl8139,netdev=n0,mac=00:00:00:11:11:11 -debugcon stdio + qemu-system-x86_64 -smp 4 -netdev user,id=n0,tftp=./test_image,bootfile=boot/limine-bios-pxe.bin -device rtl8139,netdev=n0,mac=00:00:00:11:11:11 -debugcon stdio .PHONY: uefi-x86-64-test uefi-x86-64-test: