diff --git a/Makefile b/Makefile index c79d6ee..218f53c 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ CFLAGS_arm64 += $(call CFLAGS_COND,arm64) # # Final targets -all : ntloader ntloader.i386 ntloader.x86_64 ntloader.arm64 +all : ntloader ntloader.x86_64 ntloader.arm64 ntloader : ntloader.x86_64 Makefile $(CP) $< $@ @@ -184,10 +184,6 @@ ntloader.%.elf : lib.%.a script.lds Makefile $(LD_$*) $(LDFLAGS) $(LDFLAGS_$*) -T script.lds -o $@ -q \ -Map ntloader.$*.map prefix.$*.o lib.$*.a -ntloader.i386.efi : \ -ntloader.%.efi : ntloader.%.elf elf2efi32 Makefile - ./elf2efi32 --hybrid $< $@ - ntloader.x86_64.efi ntloader.arm64.efi : \ ntloader.%.efi : ntloader.%.elf elf2efi64 Makefile ./elf2efi64 --hybrid $< $@ @@ -208,13 +204,6 @@ include utils/build.mk %.i386.s : %.c $(HEADERS) Makefile $(CC_i386) $(CFLAGS) $(CFLAGS_i386) -S $< -o $@ -%.i386.o : %.i386.s i386.i Makefile - $(AS_i386) $(ASFLAGS) $(ASFLAGS_i386) i386.i $< -o $@ - -lib.i386.a : $(OBJECTS_i386) Makefile - $(RM) -f $@ - $(AR_i386) -r -s $@ $(OBJECTS_i386) - ############################################################################### # # i386 objects to be linked into an x86_64 binary @@ -266,7 +255,6 @@ lib.arm64.a : $(OBJECTS_arm64) Makefile clean : $(RM) -f $(RM_FILES) $(RM) -f *.s *.o *.a *.elf *.map - $(RM) -f ntloader.i386 ntloader.i386.* $(RM) -f ntloader.x86_64 ntloader.x86_64.* $(RM) -f ntloader.arm64 ntloader.arm64.* $(RM) -f ntloader diff --git a/utils/build.mk b/utils/build.mk index 4d6cc3c..a22fe57 100644 --- a/utils/build.mk +++ b/utils/build.mk @@ -9,9 +9,6 @@ HOST_CFLAGS += -Wall -W -Werror -fshort-wchar -DNTLOADER_UTIL # EFI relocator # -elf2efi32 : utils/elf2efi.c - $(HOST_CC) $(HOST_CFLAGS) -idirafter include/ -DEFI_TARGET32 $< -o $@ - elf2efi64 : utils/elf2efi.c $(HOST_CC) $(HOST_CFLAGS) -idirafter include/ -DEFI_TARGET64 $< -o $@ diff --git a/utils/rootfs/bootia32.efi b/utils/rootfs/bootia32.efi deleted file mode 100644 index f4026aa..0000000 Binary files a/utils/rootfs/bootia32.efi and /dev/null differ