cleanup repo

Makefile

 
+BITS ?= 64
+
 default: assemble-legacy
 
 bootloader-legacy:
-	$(MAKE) -C bootloader-legacy
+	BITS=$(BITS) $(MAKE) -C bootloader-legacy
 
 bootloader-uefi:
-	$(MAKE) -C bootloader-uefi
+	# BITS=$(BITS) $(MAKE) -C bootloader-uefi
 
 kernel:
-	$(MAKE) -C kernel
+	BITS=$(BITS) $(MAKE) -C kernel
 
 .PHONY: bootloader-legacy bootloader-uefi kernel
 

bootloader-legacy/Makefile

-build:
-	nasm -f bin boot.asm -o boot.img
-
-build_x86:
-
-build_x86_64:
+BITS ?= 64
 
+build:
+	nasm -f bin boot.asm -DTARGET_BITS=$(BITS) -o boot.img
 
 run: build
 	qemu-system-x86_64 boot.img
 
+clean:
+	rm -f boot.img
+
+

bootloader-legacy/boot.asm

@@ -100,6 +100,7 @@ _prot_begin:
     mov ebx, _motd_32
     call println_vga
 
+%if TARGET_BITS == 64
     ; Test if 64bit available
     call test_support_long_mode
     cmp eax, 0
@@ -112,6 +113,9 @@ _test_passed:
     jmp inline_enter_long_mode
 %include "./inline_x64lib.inc"
     jmp _call_kern_64
+%else
+    jmp _call_kern_32
+%endif
 
 [bits 32]
 _call_kern_32: