[RSDK-9855] Repair project template cargo config and remove cruft (#401)

viamrobotics · Jan 29, 2025 · a0443bd · a0443bd
1 parent 4d96a3f
commit a0443bd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 61 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,24 +1,17 @@
 [target.xtensa-esp32-espidf]
 linker = "ldproxy"
 runner = "espflash --monitor"
-rustflags = ["-C", "default-linker-libraries", "-Clink-args=-Wl,-Map=./esp-build.map", "--cfg", "espidf_time32"]
-
+rustflags = ["--cfg", "espidf_time32"]
 
 [target.xtensa-esp32s2-espidf]
 linker = "ldproxy"
 runner = "espflash --monitor"
-rustflags = ["-C", "default-linker-libraries", "--cfg", "espidf_time32"]
+rustflags = ["--cfg", "espidf_time32"]
 
 [target.xtensa-esp32s3-espidf]
 linker = "ldproxy"
 runner = "espflash --monitor"
-rustflags = ["-C", "default-linker-libraries", "--cfg", "espidf_time32"]
-
-[target.riscv32imc-esp-espidf]
-linker = "ldproxy"
-runner = "espflash --monitor"
-rustflags = ["-C", "default-linker-libraries", "--cfg", "espidf_time32"]
-
+rustflags = ["--cfg", "espidf_time32"]
 
 [env]
 CARGO_WORKSPACE_DIR = { value = "", relative = true }

diff --git a/micro-rdk-server/.cargo/config.toml b/micro-rdk-server/.cargo/config.toml
diff --git a/micro-rdk/.cargo/config.toml b/micro-rdk/.cargo/config.toml
diff --git a/templates/project/.cargo/config.toml b/templates/project/.cargo/config.toml
@@ -3,30 +3,21 @@
 {% if mcu != "esp32" %}#{% endif %}target = "xtensa-esp32-espidf"
 {% if mcu != "esp32s2" %}#{% endif %}target = "xtensa-esp32s2-espidf"
 {% if mcu != "esp32s3" %}#{% endif %}target = "xtensa-esp32s3-espidf"
-{% if mcu != "esp32c3" %}#{% endif %}target = "riscv32imc-esp-espidf"
 
 [target.xtensa-esp32-espidf]
 linker = "ldproxy"
 runner = "espflash --monitor"
+rustflags = ["--cfg", "espidf_time32"]
 
 [target.xtensa-esp32s2-espidf]
 linker = "ldproxy"
 runner = "espflash --monitor"
+rustflags = ["--cfg", "espidf_time32"]
 
 [target.xtensa-esp32s3-espidf]
 linker = "ldproxy"
 runner = "espflash --monitor"
-
-[target.riscv32imc-esp-espidf]
-linker = "ldproxy"
-runner = "espflash --monitor"
-
-# Future - necessary for the experimental "native build" of esp-idf-sys with ESP32C3
-# See also https://github.com/ivmarkov/embuild/issues/16 [build]
-
-rustflags = ["-C", "default-linker-libraries", "--cfg", "espidf_time32"]
+rustflags = ["--cfg", "espidf_time32"]
 
 [unstable]
-
 build-std = ["std", "panic_abort"]
-#build-std-features = ["panic_immediate_abort"] # Required for older ESP-IDF versions without a realpath implementation