misc: limine-hdd.bin -> limine-bios-hdd.bin
This commit is contained in:
parent
7b1284808a
commit
38ccb76c40
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@ -59,8 +59,8 @@ jobs:
|
|||||||
- name: Copy limine.h to bin
|
- name: Copy limine.h to bin
|
||||||
run: cp limine.h build/bin/
|
run: cp limine.h build/bin/
|
||||||
|
|
||||||
- name: Remove limine-hdd.bin
|
- name: Remove limine-bios-hdd.bin
|
||||||
run: rm build/bin/limine-hdd.bin
|
run: rm build/bin/limine-bios-hdd.bin
|
||||||
|
|
||||||
- name: Push binaries to binary branch
|
- name: Push binaries to binary branch
|
||||||
run: |
|
run: |
|
||||||
|
@ -109,12 +109,12 @@ all1: $(BUILD_UEFI_X86_64) $(BUILD_UEFI_IA32) $(BUILD_UEFI_AARCH64) $(BUILD_UEFI
|
|||||||
$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine'
|
$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine'
|
||||||
$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin'
|
$(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin'
|
||||||
|
|
||||||
$(call MKESCAPE,$(BINDIR))/limine-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-hdd.bin
|
$(call MKESCAPE,$(BINDIR))/limine-bios-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-bios-hdd.bin
|
||||||
$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
|
$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
|
||||||
cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/host/hgen.sh' >limine-hdd.h
|
cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/host/hgen.sh' >limine-bios-hdd.h
|
||||||
|
|
||||||
ifeq ($(BUILD_BIOS),limine-bios)
|
ifeq ($(BUILD_BIOS),limine-bios)
|
||||||
$(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c $(call MKESCAPE,$(BINDIR))/limine-hdd.h
|
$(call MKESCAPE,$(BINDIR))/limine: $(call MKESCAPE,$(BINDIR))/Makefile $(call MKESCAPE,$(SRCDIR))/host/limine.c $(call MKESCAPE,$(BINDIR))/limine-bios-hdd.h
|
||||||
else
|
else
|
||||||
override LIMINE_NO_BIOS := -DLIMINE_NO_BIOS
|
override LIMINE_NO_BIOS := -DLIMINE_NO_BIOS
|
||||||
|
|
||||||
@ -194,7 +194,7 @@ uninstall:
|
|||||||
|
|
||||||
$(call MKESCAPE,$(BUILDDIR))/stage1.stamp: $(STAGE1_FILES) $(call MKESCAPE,$(BUILDDIR))/decompressor-build/decompressor.bin $(call MKESCAPE,$(BUILDDIR))/common-bios/stage2.bin.gz
|
$(call MKESCAPE,$(BUILDDIR))/stage1.stamp: $(STAGE1_FILES) $(call MKESCAPE,$(BUILDDIR))/decompressor-build/decompressor.bin $(call MKESCAPE,$(BUILDDIR))/common-bios/stage2.bin.gz
|
||||||
$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
|
$(MKDIR_P) '$(call SHESCAPE,$(BINDIR))'
|
||||||
cd '$(call SHESCAPE,$(SRCDIR))/stage1/hdd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-hdd.bin'
|
cd '$(call SHESCAPE,$(SRCDIR))/stage1/hdd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-hdd.bin'
|
||||||
ifneq ($(BUILD_BIOS_CD),no)
|
ifneq ($(BUILD_BIOS_CD),no)
|
||||||
cd '$(call SHESCAPE,$(SRCDIR))/stage1/cd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-cd.bin'
|
cd '$(call SHESCAPE,$(SRCDIR))/stage1/cd' && nasm bootsect.asm -Wall $(WERROR_FLAG) -fbin -DBUILDDIR="'"'$(call NASMESCAPE,$(BUILDDIR))'"'" -o '$(call SHESCAPE,$(BINDIR))/limine-bios-cd.bin'
|
||||||
endif
|
endif
|
||||||
|
@ -9,7 +9,7 @@ cat <<EOF
|
|||||||
const uint8_t binary_limine_hdd_bin_data[] = {
|
const uint8_t binary_limine_hdd_bin_data[] = {
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
od -v -An -t x1 <limine-hdd.bin | "$SED" '/^$/d;s/ */ /g;s/ *$//g;s/ /, 0x/g;s/^, / /g;s/$/,/g;s/^ , / /g'
|
od -v -An -t x1 <limine-bios-hdd.bin | "$SED" '/^$/d;s/ */ /g;s/ *$//g;s/ /, 0x/g;s/^, / /g;s/$/,/g;s/^ , / /g'
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
};
|
};
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
#ifndef LIMINE_NO_BIOS
|
#ifndef LIMINE_NO_BIOS
|
||||||
#include "limine-hdd.h"
|
#include "limine-bios-hdd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void remove_arg(int *argc, char *argv[], int index) {
|
static void remove_arg(int *argc, char *argv[], int index) {
|
||||||
|
Loading…
Reference in New Issue
Block a user