diff --git a/CMakeLists.txt b/CMakeLists.txt index aa5d008..26ea5ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,6 @@ set_disk_image_size(48) # Build all subprojects add_subdirectory(boot) -add_subdirectory(bootdata) add_subdirectory(drivers) add_subdirectory(sdk) add_subdirectory(xtldr) diff --git a/README.md b/README.md index bd71f4f..6ee5099 100644 --- a/README.md +++ b/README.md @@ -57,16 +57,17 @@ ExectOS is in very early development stage, thus its requirements have been not design, it requires a modern EFI enabled hardware. It is not possible currently to boot ExectOS on a legacy BIOS. # Source structure -| Directory | Description | -|-------------|----------------------------------------------------------| -| bootdata | default configuration and data needed to boot XTOS | -| drivers | XT native drivers source code | -| sdk/cmake | Host toolchain configuration and build-related functions | -| sdk/xtdk | XT Software Development Kit headers | -| services | integral subsystems services source code | -| subsystems | environment subsystems source code | -| xtoskrnl | XTOS kernel source code | -| xtldr | XTOS boot loader source code | +| Directory | Description | +|------------------|--------------------------------------------------------------| +| boot/bootdata | default configuration and data needed to boot XTOS | +| boot/bootsect | boot sector code (MBR & VBR) initializing the boot process | +| drivers | XT native drivers source code | +| sdk/cmake | Host toolchain configuration and build-related functions | +| sdk/xtdk | XT Software Development Kit headers | +| services | integral subsystems services source code | +| subsystems | environment subsystems source code | +| xtoskrnl | XTOS kernel source code | +| xtldr | XTOS boot loader source code | # Build XTOS can only be built using [XTchain](https://git.codingworkshop.eu.org/xt-sys/xtchain), a dedicated toolchain designed diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 074d682..20afed0 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -1 +1,2 @@ +add_subdirectory(bootdata) add_subdirectory(bootsect) diff --git a/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt similarity index 100% rename from bootdata/CMakeLists.txt rename to boot/bootdata/CMakeLists.txt diff --git a/bootdata/xtldr/CMakeLists.txt b/boot/bootdata/xtldr/CMakeLists.txt similarity index 100% rename from bootdata/xtldr/CMakeLists.txt rename to boot/bootdata/xtldr/CMakeLists.txt diff --git a/bootdata/xtldr/xtldr.ini b/boot/bootdata/xtldr/xtldr.ini similarity index 100% rename from bootdata/xtldr/xtldr.ini rename to boot/bootdata/xtldr/xtldr.ini