diff options
Diffstat (limited to 'dev/ZBAKit')
| -rw-r--r-- | dev/ZBAKit/ReadMe.md | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/amd64-efi.make | 20 | ||||
| -rw-r--r-- | dev/ZBAKit/src/HEL/AMD64/BootMain.cc | 6 |
3 files changed, 16 insertions, 12 deletions
diff --git a/dev/ZBAKit/ReadMe.md b/dev/ZBAKit/ReadMe.md index 02239d3d..14157e7c 100644 --- a/dev/ZBAKit/ReadMe.md +++ b/dev/ZBAKit/ReadMe.md @@ -8,7 +8,7 @@ You need: Start by cloning the repo: ``` -git clone git@bitbucket.org:mahrouss/microKernel.git +git clone git@github.com:ElMahroussLogic/zka-dev.git ``` And then execute: diff --git a/dev/ZBAKit/amd64-efi.make b/dev/ZBAKit/amd64-efi.make index f817f351..254a1ffc 100644 --- a/dev/ZBAKit/amd64-efi.make +++ b/dev/ZBAKit/amd64-efi.make @@ -32,9 +32,7 @@ IMG_3=epm-master-2.img EMU_FLAGS=-net none -smp 1 -m 8G -M q35 \ -bios $(BIOS) -drive \ file=fat:rw:src/Root/,index=2,format=raw \ - -drive id=disk_2,file=$(IMG),if=none \ - -device ahci,id=ahci \ - -device ide-hd,drive=disk_2,bus=ahci.0 -serial stdio -no-shutdown -no-reboot + -serial stdio -no-shutdown -no-reboot LD_FLAGS=-e Main --subsystem=10 @@ -47,7 +45,9 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEWOSKRNL__ -D__NEWOSLDR__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../ZKAKit -I../ -c -nostdlib -fno-rtti -fno-exceptions \ - -std=c++20 -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ + -std=c++20 -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ + +# -DZKA_AUTO_FORMAT BOOTLOADER=zbaosldr.exe KERNEL=minoskrnl.exe @@ -83,11 +83,15 @@ compile-amd64: $(wildcard src/HEL/AMD64/*.S) \ $(wildcard src/*.cc) -.PHONY: run-efi-amd64 -run-efi-amd64: - $(EMU) $(EMU_FLAGS) +.PHONY: run-efi-amd64-ahci +run-efi-amd64-ahci: + $(EMU) $(EMU_FLAGS) -hdd $(IMG) + +.PHONY: run-efi-amd64-ata +run-efi-amd64-ata: + $(EMU) $(EMU_FLAGS) -device piix3-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -# img_2 is the rescue disk. img is the bootable disk, as provided by the Zeta. +# img_2 is the rescue disk. img is the bootable disk, as provided by the Zeta specs. .PHONY: epm-img epm-img: qemu-img create -f raw $(IMG) 10G diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc index b43e0715..cfc02837 100644 --- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc +++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc @@ -155,7 +155,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, mp->GetNumberOfProcessors(mp, &cnt_disabled, &cnt_enabled); #ifdef ZBA_USE_FB - CGDrawString("ZBA (c) EL Mahrouss Logic", 10, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("ZBA (c) EL Mahrouss Logic.", 10, 10, RGB(0xFF, 0xFF, 0xFF)); CGDrawString((cnt_enabled > 1) ? "SMP detected." : "Single processor configuration detected.", 20, 10, RGB(0xFF, 0xFF, 0xFF)); #endif // ZBA_USE_FB @@ -173,7 +173,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, #ifdef ZKA_AUTO_FORMAT if (!partition_factory.IsPartitionValid()) { - CGDrawString("Formatting EPM disk...", 20, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("Formatting EPM disk...", 30, 10, RGB(0xFF, 0xFF, 0xFF)); Boot::BDiskFormatFactory<BootDeviceATA>::BFileDescriptor root; root.fFileName[0] = kNeFSRoot[0]; @@ -187,7 +187,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, } else { - CGDrawString("Booting from EPM disk...", 20, 10, RGB(0xFF, 0xFF, 0xFF)); + CGDrawString("Booting from EPM disk...", 30, 10, RGB(0xFF, 0xFF, 0xFF)); } #endif // ZKA_AUTO_FORMAT |