Remove yml exception for S3 (#3039)

* Remove yml exception for S3 * Fix warnings
esp-rs · Jan 27, 2025 · 5139ff1 · 5139ff1
1 parent b0060a1
commit 5139ff1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -118,13 +118,7 @@ jobs:
           ldproxy: false
           version: 1.84.0.0
 
-      # remove once we have a proper solution for target specific configs
-      - name: Build tests ESP32S3
-        if: ${{ matrix.target.soc == 'esp32s3'}}
-        run: ESP_HAL_CONFIG_PSRAM_MODE="octal" cargo xtask build-tests ${{ matrix.target.soc }}
-
       - name: Build tests
-        if: ${{ matrix.target.soc != 'esp32s3'}}
         run: cargo xtask build-tests ${{ matrix.target.soc }}
 
       - uses: actions/upload-artifact@v4

diff --git a/esp-hal-embassy/src/executor/thread.rs b/esp-hal-embassy/src/executor/thread.rs
@@ -3,7 +3,7 @@
 use core::marker::PhantomData;
 
 use embassy_executor::Spawner;
-#[cfg(multi_core)]
+#[cfg(all(low_power_wait, multi_core))]
 use esp_hal::interrupt::software::SoftwareInterrupt;
 use esp_hal::{interrupt::Priority, Cpu};
 #[cfg(low_power_wait)]

diff --git a/hil-test/tests/gpio_custom_handler.rs b/hil-test/tests/gpio_custom_handler.rs
@@ -15,7 +15,6 @@ use embassy_time::{Duration, Timer};
 use esp_hal::{
     gpio::{AnyPin, Flex, Input, InputConfig, Io, Level, Output, OutputConfig, Pull},
     handler,
-    interrupt::InterruptConfigurable,
     timer::timg::TimerGroup,
 };
 use hil_test as _;

diff --git a/hil-test/tests/spi_half_duplex_write_psram.rs b/hil-test/tests/spi_half_duplex_write_psram.rs
@@ -2,6 +2,8 @@
 
 //% CHIPS: esp32s3
 //% FEATURES: unstable psram
+// The dev kit in the HIL-tester has octal PSRAM.
+//% ENV: ESP_HAL_CONFIG_PSRAM_MODE=octal
 
 #![no_std]
 #![no_main]