summaryrefslogtreecommitdiffhomepage
path: root/newBoot
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-01-26 19:17:00 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-01-26 19:17:00 +0100
commitdd192787a70a973f2474720aea49af3f6ddabb7a (patch)
tree6405e001c3b8eaf65e2b964d9917de0767914c0e /newBoot
parent5b972c4818f5bbcff5537c1fc3866f548647a3ef (diff)
h-core: Breaking kernel changes, IDevice becomes DeviceInterface, the
UPT is Read Only by default. DebugManager allocates space for users by default (for a debug message) Update PEF enum kPefArch. Move Seeker into the /Services directory. Complete merge of SupportKit to KernelKit. Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'newBoot')
-rw-r--r--newBoot/Source/Start.cxx8
-rw-r--r--newBoot/Source/makefile12
2 files changed, 7 insertions, 13 deletions
diff --git a/newBoot/Source/Start.cxx b/newBoot/Source/Start.cxx
index 5f320ac7..7c8b5e04 100644
--- a/newBoot/Source/Start.cxx
+++ b/newBoot/Source/Start.cxx
@@ -9,11 +9,9 @@
#include <BootKit/Boot.hpp>
-extern "C" void __AppMain(void)
+extern "C" void Main(void)
{
BKTextWriter writer;
- writer.WriteString("Starting hCore...", kBlack, kWhite, 0, 0);
-
- const char* args[] = { "/hCore.bin" };
- const char* envp[] = { "/" };
+ writer.WriteString("Booting Kernel...", kBlack, kWhite, 0, 0);
+
}
diff --git a/newBoot/Source/makefile b/newBoot/Source/makefile
index 81bb2096..835e4afa 100644
--- a/newBoot/Source/makefile
+++ b/newBoot/Source/makefile
@@ -1,13 +1,9 @@
-CC=fcc
-CCFLAGS=-I ../ -ffreestanding -nostdlib
-ASM=fasm
-ASMFLAGS=/ARC /PEF
+CC=gcc
+CCFLAGS=-I../ -I../../ -std=c++20 -ffreestanding -nostdlib -c
.PHONY: arch-arc
arch-arc:
- ${CC} ${CCFLAGS} Boot.cpp Start.cpp -c
- ${ASM} ${ASMFLAGS} Arch/ARC/XPM.asm
- ${ASM} ${ASMFLAGS} Arch/ARC/Crt0.asm
+ ${CC} ${CCFLAGS} Start.cxx
CC_GNU=x86_64-elf-gcc
LD_GNU=x86_64-elf-ld
@@ -16,7 +12,7 @@ FLAG_GNU=-I../ -I../../../efiSDK/inc -c -ffreestanding -fno-rtti -fno-exceptions
.PHONY: arch-amd64
arch-amd64:
$(CC_GNU) $(FLAG_GNU) Arch/AMD64/BootAMD64.cxx *.cxx
- $(LD_GNU) *.o -e __AppMain -Ttext 0x000 --oformat binary -o BootloaderStage2.bin
+ $(LD_GNU) *.o -e Main -Ttext 0x000 --oformat binary -o BootloaderStage2.bin
.PHONY: clean
clean: