Automatically set the global mem pool from kconfig

Author: tylerwhall

CMakeLists.txt

@@ -73,6 +73,7 @@ ExternalProject_Add(
         env
         "ZEPHYR_BINDGEN=${zephyr_bindgen}"
         "CONFIG_USERSPACE=${CONFIG_USERSPACE}"
+        "CONFIG_RUST_ALLOC_POOL=${CONFIG_RUST_ALLOC_POOL}"
         "TARGET_CFLAGS=${external_project_cflags} --target=${clang_target}"
         "SYSROOT=${rust_sysroot}"
         "SYSROOT_BUILD=${rust_sysroot_build}"

rust/zephyr-core/build.rs

@@ -2,4 +2,7 @@ fn main() {
     if std::env::var("CONFIG_USERSPACE").expect("CONFIG_USERSPACE must be set") == "y" {
         println!("cargo:rustc-cfg=usermode");
     }
+    if std::env::var("CONFIG_RUST_ALLOC_POOL").expect("CONFIG_RUST_ALLOC_POOL must be set") == "y" {
+        println!("cargo:rustc-cfg=mempool");
+    }
 }

rust/zephyr-core/src/lib.rs

@@ -17,6 +17,10 @@ pub use time::*;
 // Set from environment from build.rs
 pub const CONFIG_USERSPACE: bool = cfg!(usermode);
 
+// Use this mem pool for global allocs instead of kmalloc
+#[cfg(mempool)]
+crate::global_sys_mem_pool!(rust_std_mem_pool);
+
 /// Convert a negative error code to a Result
 pub trait NegErr {
     fn neg_err(&self) -> Result<u32, u32>;

samples/rust-app/src/lib.rs

@@ -18,9 +18,6 @@ use zephyr::mutex::*;
 use zephyr::semaphore::*;
 use zephyr::thread::ThreadSyscalls;
 
-// Use this mem pool for global allocs instead of kmalloc
-zephyr::global_sys_mem_pool!(rust_std_mem_pool);
-
 thread_local!(static TLS: RefCell<u8> = RefCell::new(1));
 
 zephyr_macros::k_mutex_define!(MUTEX);