summaryrefslogtreecommitdiffhomepage
path: root/dev/Boot
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-01-11 13:52:54 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-01-11 14:20:24 +0100
commit6c7d60a690aa3358b3240ebdfdf1feb62956d747 (patch)
tree26ea032a2beff8e4d5a5d3f96a59141f5aaec072 /dev/Boot
parentd4211b210e3e63f69bc3b86555b563a323f8d865 (diff)
ADD: Fully implement final patent.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Boot')
-rw-r--r--dev/Boot/BootKit/BootKit.h3
-rw-r--r--dev/Boot/amd64-desktop.make4
2 files changed, 4 insertions, 3 deletions
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h
index db21ba30..050d5929 100644
--- a/dev/Boot/BootKit/BootKit.h
+++ b/dev/Boot/BootKit/BootKit.h
@@ -345,7 +345,7 @@ namespace Boot
part.Version = kNeFSVersionInteger;
part.CatalogCount = blob_cnt;
part.Kind = kNeFSHardDrive;
- part.SectorSize = sizeof(NFS_ROOT_PARTITION_BLOCK);
+ part.SectorSize = 512;
part.FreeCatalog = fDiskDev.GetSectorsCount() / sizeof(NFS_CATALOG_STRUCT);
part.SectorCount = fDiskDev.GetSectorsCount();
part.FreeSectors = fDiskDev.GetSectorsCount();
@@ -377,6 +377,7 @@ namespace Boot
epm_boot.FsVersion = kNeFSVersionInteger;
epm_boot.LbaStart = kNeFSRootCatalogStartAddress;
+ epm_boot.LbaEnd = fDiskDev.GetDiskSize();
epm_boot.SectorSz = part.SectorSize;
epm_boot.Kind = kEPMZkaOS;
epm_boot.NumBlocks = part.CatalogCount;
diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make
index 395b4e86..3fc704b6 100644
--- a/dev/Boot/amd64-desktop.make
+++ b/dev/Boot/amd64-desktop.make
@@ -31,7 +31,7 @@ IMG_2=epm-master-2.img
EMU_FLAGS=-net none -smp 4 -m 8G -M q35 \
-bios $(BIOS) -drive \
file=fat:rw:src/Root/,index=2,format=raw \
- -monitor stdio
+ -serial stdio
LD_FLAGS=-e Main --subsystem=10
@@ -44,7 +44,7 @@ REM_FLAG=-f
FLAG_ASM=-f win64
FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__MINOSKRNL__ -D__ZBAOSLDR__ \
-DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I../ -c -nostdlib -fno-rtti -fno-exceptions \
- -std=c++20 -DBOOTZ_GPT_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT
+ -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT
BOOTLOADER=zbaosldr.exe
KERNEL=minoskrnl.exe