From 848a426afecde3d30ef292ec50eddd7f36e10141 Mon Sep 17 00:00:00 2001 From: sawyer bristol Date: Wed, 21 Jan 2026 15:26:58 -0700 Subject: [PATCH] small fixes probe --- .cargo/config.toml | 2 +- kernel/Cargo.toml | 20 ++++++++++++-------- user_apps/gboy/build.rs | 3 +++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index ed4802e..8424eec 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,5 +1,5 @@ [target.'cfg(all(target_arch = "arm", target_os = "none"))'] -runner = "probe-rs run --chip RP2350" +runner = "probe-rs run --chip RP2350xa" # runner = "elf2uf2-rs -d" [build] diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 5c03af9..ef33549 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -10,11 +10,14 @@ test = false doctest = false bench = false +[profile.release] +debug = true + [features] -default = ["rp235x"] -pimoroni2w = ["rp235x", "psram"] +default = ["rp235xa"] +pimoroni2w = ["rp235xa", "psram"] # rp2040 = ["embassy-rp/rp2040"] # unsupported, ram too small for fb -rp235x = ["embassy-rp/rp235xb"] +rp235xa = ["embassy-rp/rp235xa"] trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"] psram = ["dep:embedded-alloc"] overclock = [] @@ -63,15 +66,16 @@ cyw43 = { version = "0.3.0", features = [ cyw43-pio = { version = "0.3.0", optional = true } critical-section = "1.2.0" +cortex-m = { version = "0.7.7", features = ["inline-asm"] } +cortex-m-rt = "0.7.5" +panic-probe = { version = "0.3", features = ["print-defmt"] } +portable-atomic = { version = "1.11", features = ["critical-section"] } +assign-resources = "0.5.0" + embedded-hal-bus = { version = "0.3.0", features = ["async"] } embedded-hal = "0.2.7" embedded-hal_2 = { package = "embedded-hal", version = "1.0.0" } embedded-hal-async = "1.0.0" -cortex-m = { version = "0.7.7" } -cortex-m-rt = "0.7.5" -panic-probe = "0.3" -portable-atomic = { version = "1.11", features = ["critical-section"] } -assign-resources = "0.5.0" defmt = { version = "1.0.1", optional = true } defmt-rtt = "1.1.0" diff --git a/user_apps/gboy/build.rs b/user_apps/gboy/build.rs index 65d9a97..86d02df 100644 --- a/user_apps/gboy/build.rs +++ b/user_apps/gboy/build.rs @@ -50,6 +50,9 @@ fn bindgen() { .define("ENABLE_LCD", None) .file("peanut_gb_stub.c") .include("Peanut-GB") + .include("../../picolibc/newlib/libc/include") + .include("../../picolibc/build/newlib/libc/include") + .include("../../picolibc/build") // optimization flags .flag("-Ofast") .flag("-fdata-sections")