ci+x86_64: switch to -baremetal builds and invert singlecore feature

oro-os · Jan 17, 2025 · f6a6fd1 · f6a6fd1
1 parent 528a6b1
commit f6a6fd1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,13 +1,13 @@
 [alias]
 kernel-x86_64 = "build --target oro-arch-x86_64/x86_64-unknown-oro.json --features oro-debug/uart16550 --bin oro-kernel-x86_64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
 
-kernel-x86_64-quiet = "build --target oro-arch-x86_64/x86_64-unknown-oro.json --bin oro-kernel-x86_64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
+kernel-x86_64-baremetal = "build --target oro-arch-x86_64/x86_64-unknown-oro.json --features oro-arch-x86_64/force-singlecore --bin oro-kernel-x86_64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
 
 kernel-aarch64 = "build --target oro-arch-aarch64/aarch64-unknown-oro.json --features oro-debug/pl011 --bin oro-kernel-aarch64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
 
 limine-x86_64 = "build --target oro-arch-x86_64/x86_64-unknown-oro.json --features oro-debug/uart16550 --bin oro-limine-x86_64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
 
-limine-x86_64-quiet = "build --target oro-arch-x86_64/x86_64-unknown-oro.json --bin oro-limine-x86_64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
+limine-x86_64-baremetal = "build --target oro-arch-x86_64/x86_64-unknown-oro.json --bin oro-limine-x86_64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
 
 limine-aarch64 = "build --target oro-arch-aarch64/aarch64-unknown-oro.json --features oro-debug/pl011 --bin oro-limine-aarch64 -Zunstable-options -Zbuild-std=core,compiler_builtins,alloc -Zbuild-std-features=compiler-builtins-mem"
 

diff --git a/oro-arch-x86_64/Cargo.toml b/oro-arch-x86_64/Cargo.toml
@@ -16,7 +16,7 @@ build = "build.rs"
 
 [features]
 default = []
-multicore = []
+force-singlecore = []
 
 [lib]
 path = "src/lib.rs"

diff --git a/oro-arch-x86_64/src/boot/mod.rs b/oro-arch-x86_64/src/boot/mod.rs
@@ -120,9 +120,9 @@ pub unsafe fn boot_primary() -> ! {
 	dbg!("local APIC ID: {lapic_id}");
 
 	{
-		#[cfg(feature = "multicore")]
+		#[cfg(not(feature = "force-singlecore"))]
 		const MULTICORE_ENABLED: bool = true;
-		#[cfg(not(feature = "multicore"))]
+		#[cfg(feature = "force-singlecore")]
 		const MULTICORE_ENABLED: bool = false;
 
 		let num_cores = if MULTICORE_ENABLED && has_cs89 {