diff --git a/AnasOS/boot/grub/grub.cfg b/AnasOS/boot/grub/grub.cfg index 989e882f..2315a322 100644 --- a/AnasOS/boot/grub/grub.cfg +++ b/AnasOS/boot/grub/grub.cfg @@ -1,3 +1,5 @@ +set timeout=5 + menuentry "AnasOS"{ multiboot /boot/kernel boot diff --git a/Makefile b/Makefile index d6417e11..8243c3b3 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ test: echo "No tests for now" kernel-rust: - @cd ./anasos-kernel && cargo +nightly build --release --target x86_64-unknown-none + @cd ./anasos-kernel && cargo build --release image: @cp ./anasos-kernel/target/x86_64-unknown-none/release/anasos-kernel AnasOS/boot/kernel diff --git a/anasos-kernel/.cargo/config.toml b/anasos-kernel/.cargo/config.toml index e6dfe14b..771ba153 100644 --- a/anasos-kernel/.cargo/config.toml +++ b/anasos-kernel/.cargo/config.toml @@ -2,7 +2,6 @@ target = ["x86_64-unknown-none"] [target.x86_64-unknown-none] -linker = "ld" rustflags = [ "-C", "code-model=kernel", "-C", "relocation-model=static", diff --git a/anasos-kernel/linker.ld b/anasos-kernel/linker.ld index e601f82b..6089c60e 100644 --- a/anasos-kernel/linker.ld +++ b/anasos-kernel/linker.ld @@ -1,9 +1,10 @@ -OUTPUT_FORMAT(elf32-i386) +OUTPUT_FORMAT(binary) ENTRY(start) SECTIONS { . = 0x100000; - .text : {*(.text)} - .data : {*(.data)} - .bss : {*(.bss)} -} \ No newline at end of file + .multiboot : { *(.multiboot) } + .text : { *(.text) } + .data : { *(.data) } + .bss : { *(.bss) } +} diff --git a/anasos-kernel/rust-toolchain b/anasos-kernel/rust-toolchain new file mode 100644 index 00000000..07ade694 --- /dev/null +++ b/anasos-kernel/rust-toolchain @@ -0,0 +1 @@ +nightly \ No newline at end of file