summaryrefslogtreecommitdiffhomepage
path: root/Boot
diff options
context:
space:
mode:
Diffstat (limited to 'Boot')
-rw-r--r--Boot/Sources/.gitkeep (renamed from Boot/Source/.gitkeep)0
-rw-r--r--Boot/Sources/BootloaderRsrc.rsrc (renamed from Boot/Source/BootloaderRsrc.rsrc)0
-rw-r--r--Boot/Sources/HEL/AMD64/.gitkeep (renamed from Boot/Source/HEL/AMD64/.gitkeep)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootAHCI.cxx (renamed from Boot/Source/HEL/AMD64/BootAHCI.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootATA.cxx (renamed from Boot/Source/HEL/AMD64/BootATA.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootFileReader.cxx (renamed from Boot/Source/HEL/AMD64/BootFileReader.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootJump.S (renamed from Boot/Source/HEL/AMD64/BootJump.S)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootMain.cxx (renamed from Boot/Source/HEL/AMD64/BootMain.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootPlatform.cxx (renamed from Boot/Source/HEL/AMD64/BootPlatform.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootString.cxx (renamed from Boot/Source/HEL/AMD64/BootString.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/BootTextWriter.cxx (renamed from Boot/Source/HEL/AMD64/BootTextWriter.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/New+Delete.cxx (renamed from Boot/Source/HEL/AMD64/New+Delete.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/Support.cxx (renamed from Boot/Source/HEL/AMD64/Support.cxx)0
-rw-r--r--Boot/Sources/HEL/AMD64/compile_flags.txt (renamed from Boot/Source/HEL/AMD64/compile_flags.txt)0
-rw-r--r--Boot/Sources/HEL/ARM64/.gitkeep (renamed from Boot/Source/HEL/ARM64/.gitkeep)0
-rw-r--r--Boot/Sources/HEL/POWER/.gitkeep (renamed from Boot/Source/HEL/POWER/.gitkeep)0
-rw-r--r--Boot/Sources/HEL/POWER/CoreBootStartup.S (renamed from Boot/Source/HEL/POWER/CoreBootStartup.S)0
-rw-r--r--Boot/Sources/HEL/RISCV/.gitkeep (renamed from Boot/Source/HEL/RISCV/.gitkeep)0
-rw-r--r--Boot/Sources/HEL/RISCV/BootRISCV.S (renamed from Boot/Source/HEL/RISCV/BootRISCV.S)0
-rw-r--r--Boot/Sources/Root/EFI/STARTUP.NSH (renamed from Boot/Source/Root/EFI/STARTUP.NSH)0
-rw-r--r--Boot/Sources/Root/SplashScreen.fmt (renamed from Boot/Source/Root/SplashScreen.fmt)0
-rw-r--r--Boot/Sources/compile_flags.txt (renamed from Boot/Source/compile_flags.txt)0
-rw-r--r--Boot/Sources/ovmf.ps1 (renamed from Boot/Source/ovmf.ps1)0
-rw-r--r--Boot/makefile20
24 files changed, 10 insertions, 10 deletions
diff --git a/Boot/Source/.gitkeep b/Boot/Sources/.gitkeep
index e69de29b..e69de29b 100644
--- a/Boot/Source/.gitkeep
+++ b/Boot/Sources/.gitkeep
diff --git a/Boot/Source/BootloaderRsrc.rsrc b/Boot/Sources/BootloaderRsrc.rsrc
index 0282192b..0282192b 100644
--- a/Boot/Source/BootloaderRsrc.rsrc
+++ b/Boot/Sources/BootloaderRsrc.rsrc
diff --git a/Boot/Source/HEL/AMD64/.gitkeep b/Boot/Sources/HEL/AMD64/.gitkeep
index e69de29b..e69de29b 100644
--- a/Boot/Source/HEL/AMD64/.gitkeep
+++ b/Boot/Sources/HEL/AMD64/.gitkeep
diff --git a/Boot/Source/HEL/AMD64/BootAHCI.cxx b/Boot/Sources/HEL/AMD64/BootAHCI.cxx
index d60b91fd..d60b91fd 100644
--- a/Boot/Source/HEL/AMD64/BootAHCI.cxx
+++ b/Boot/Sources/HEL/AMD64/BootAHCI.cxx
diff --git a/Boot/Source/HEL/AMD64/BootATA.cxx b/Boot/Sources/HEL/AMD64/BootATA.cxx
index c82cb2ea..c82cb2ea 100644
--- a/Boot/Source/HEL/AMD64/BootATA.cxx
+++ b/Boot/Sources/HEL/AMD64/BootATA.cxx
diff --git a/Boot/Source/HEL/AMD64/BootFileReader.cxx b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
index 7ec6b7ab..7ec6b7ab 100644
--- a/Boot/Source/HEL/AMD64/BootFileReader.cxx
+++ b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
diff --git a/Boot/Source/HEL/AMD64/BootJump.S b/Boot/Sources/HEL/AMD64/BootJump.S
index af278cc7..af278cc7 100644
--- a/Boot/Source/HEL/AMD64/BootJump.S
+++ b/Boot/Sources/HEL/AMD64/BootJump.S
diff --git a/Boot/Source/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index f58709be..f58709be 100644
--- a/Boot/Source/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
diff --git a/Boot/Source/HEL/AMD64/BootPlatform.cxx b/Boot/Sources/HEL/AMD64/BootPlatform.cxx
index 866c4839..866c4839 100644
--- a/Boot/Source/HEL/AMD64/BootPlatform.cxx
+++ b/Boot/Sources/HEL/AMD64/BootPlatform.cxx
diff --git a/Boot/Source/HEL/AMD64/BootString.cxx b/Boot/Sources/HEL/AMD64/BootString.cxx
index 54ab2c64..54ab2c64 100644
--- a/Boot/Source/HEL/AMD64/BootString.cxx
+++ b/Boot/Sources/HEL/AMD64/BootString.cxx
diff --git a/Boot/Source/HEL/AMD64/BootTextWriter.cxx b/Boot/Sources/HEL/AMD64/BootTextWriter.cxx
index 90d12f3d..90d12f3d 100644
--- a/Boot/Source/HEL/AMD64/BootTextWriter.cxx
+++ b/Boot/Sources/HEL/AMD64/BootTextWriter.cxx
diff --git a/Boot/Source/HEL/AMD64/New+Delete.cxx b/Boot/Sources/HEL/AMD64/New+Delete.cxx
index 6c025646..6c025646 100644
--- a/Boot/Source/HEL/AMD64/New+Delete.cxx
+++ b/Boot/Sources/HEL/AMD64/New+Delete.cxx
diff --git a/Boot/Source/HEL/AMD64/Support.cxx b/Boot/Sources/HEL/AMD64/Support.cxx
index 22b01280..22b01280 100644
--- a/Boot/Source/HEL/AMD64/Support.cxx
+++ b/Boot/Sources/HEL/AMD64/Support.cxx
diff --git a/Boot/Source/HEL/AMD64/compile_flags.txt b/Boot/Sources/HEL/AMD64/compile_flags.txt
index e4515efe..e4515efe 100644
--- a/Boot/Source/HEL/AMD64/compile_flags.txt
+++ b/Boot/Sources/HEL/AMD64/compile_flags.txt
diff --git a/Boot/Source/HEL/ARM64/.gitkeep b/Boot/Sources/HEL/ARM64/.gitkeep
index e69de29b..e69de29b 100644
--- a/Boot/Source/HEL/ARM64/.gitkeep
+++ b/Boot/Sources/HEL/ARM64/.gitkeep
diff --git a/Boot/Source/HEL/POWER/.gitkeep b/Boot/Sources/HEL/POWER/.gitkeep
index e69de29b..e69de29b 100644
--- a/Boot/Source/HEL/POWER/.gitkeep
+++ b/Boot/Sources/HEL/POWER/.gitkeep
diff --git a/Boot/Source/HEL/POWER/CoreBootStartup.S b/Boot/Sources/HEL/POWER/CoreBootStartup.S
index f8ff99d7..f8ff99d7 100644
--- a/Boot/Source/HEL/POWER/CoreBootStartup.S
+++ b/Boot/Sources/HEL/POWER/CoreBootStartup.S
diff --git a/Boot/Source/HEL/RISCV/.gitkeep b/Boot/Sources/HEL/RISCV/.gitkeep
index e69de29b..e69de29b 100644
--- a/Boot/Source/HEL/RISCV/.gitkeep
+++ b/Boot/Sources/HEL/RISCV/.gitkeep
diff --git a/Boot/Source/HEL/RISCV/BootRISCV.S b/Boot/Sources/HEL/RISCV/BootRISCV.S
index 7a7e7db0..7a7e7db0 100644
--- a/Boot/Source/HEL/RISCV/BootRISCV.S
+++ b/Boot/Sources/HEL/RISCV/BootRISCV.S
diff --git a/Boot/Source/Root/EFI/STARTUP.NSH b/Boot/Sources/Root/EFI/STARTUP.NSH
index d29ba8fd..d29ba8fd 100644
--- a/Boot/Source/Root/EFI/STARTUP.NSH
+++ b/Boot/Sources/Root/EFI/STARTUP.NSH
diff --git a/Boot/Source/Root/SplashScreen.fmt b/Boot/Sources/Root/SplashScreen.fmt
index 863d7b62..863d7b62 100644
--- a/Boot/Source/Root/SplashScreen.fmt
+++ b/Boot/Sources/Root/SplashScreen.fmt
diff --git a/Boot/Source/compile_flags.txt b/Boot/Sources/compile_flags.txt
index c74d22b2..c74d22b2 100644
--- a/Boot/Source/compile_flags.txt
+++ b/Boot/Sources/compile_flags.txt
diff --git a/Boot/Source/ovmf.ps1 b/Boot/Sources/ovmf.ps1
index 5a2c5f0e..5a2c5f0e 100644
--- a/Boot/Source/ovmf.ps1
+++ b/Boot/Sources/ovmf.ps1
diff --git a/Boot/makefile b/Boot/makefile
index 4b4ca293..63883321 100644
--- a/Boot/makefile
+++ b/Boot/makefile
@@ -27,10 +27,10 @@ IMG=epm.img
IMG_2=epm-slave.img
EMU_FLAGS=-net none -smp 4,sockets=1,cores=4,threads=1 -m 4G -M q35 \
- -bios Source/$(BIOS) -device piix3-ide,id=ide \
+ -bios Sources/$(BIOS) -device piix3-ide,id=ide \
-drive id=disk,file=$(IMG),format=raw,if=none \
-device ide-hd,drive=disk,bus=ide.0 -drive \
- file=fat:rw:Source/Root,index=2,format=raw -d int -hdd $(IMG_2)
+ file=fat:rw:Sources/Root,index=2,format=raw -d int -hdd $(IMG_2)
LD_FLAGS=-e Main --subsystem=10
@@ -59,11 +59,11 @@ invalid-recipe:
.PHONY: all
all: compile-amd64
- mkdir -p Source/Root/EFI/BOOT
- $(LD_GNU) $(OBJ) $(LD_FLAGS) -o Source/$(BOOT_LOADER)
- $(COPY) Source/$(BOOT_LOADER) Source/Root/EFI/BOOT/BOOTX64.EFI
- $(COPY) Source/$(BOOT_LOADER) Source/Root/EFI/BOOT/NEWBOOT.EFI
- $(COPY) ../Kernel/$(KERNEL) Source/Root/$(KERNEL)
+ mkdir -p Sources/Root/EFI/BOOT
+ $(LD_GNU) $(OBJ) $(LD_FLAGS) -o Sources/$(BOOT_LOADER)
+ $(COPY) Sources/$(BOOT_LOADER) Sources/Root/EFI/BOOT/BOOTX64.EFI
+ $(COPY) Sources/$(BOOT_LOADER) Sources/Root/EFI/BOOT/NEWBOOT.EFI
+ $(COPY) ../Kernel/$(KERNEL) Sources/Root/$(KERNEL)
ifneq ($(DEBUG_SUPPORT), )
DEBUG = -D__DEBUG__
@@ -73,9 +73,9 @@ endif
compile-amd64:
$(RESCMD)
$(CC_GNU) $(NEWOS_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
- $(wildcard Source/HEL/AMD64/*.cxx) \
- $(wildcard Source/HEL/AMD64/*.S)
- $(wildcard Source/*.cxx)
+ $(wildcard Sources/HEL/AMD64/*.cxx) \
+ $(wildcard Sources/HEL/AMD64/*.S)
+ $(wildcard Sources/*.cxx)
.PHONY: run-efi-amd64
run-efi-amd64: