esp-rs · MabezDev · May 4, 2023 · Apr 28, 2023 · May 3, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -323,7 +323,7 @@ jobs:
       - name: clippy (esp32-hal)
         run: cargo +esp clippy --manifest-path=esp32-hal/Cargo.toml -- --no-deps
       - name: clippy (esp32s2-hal)
-        run: cargo +esp clippy --manifest-path=esp32s2-hal/Cargo.toml --target=xtensa-esp32s2-none-elf -Zbuild-std=core -- --no-deps
+        run: cargo +esp clippy --manifest-path=esp32s2-hal/Cargo.toml -- --no-deps
       - name: clippy (esp32s3-hal)
         run: cargo +esp clippy --manifest-path=esp32s3-hal/Cargo.toml -- --no-deps
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,10 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add bare-bones PSRAM support for ESP32 (#506)
+
 ### Fixed
 
 - DMA is supported for SPI3 on ESP32-S3 (#507)
 
+
 ## [0.9.0] - 2023-05-02
 
 ### Added

diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml
@@ -22,6 +22,7 @@ embedded-hal-1       = { version = "=1.0.0-alpha.10", optional = true, package =
 embedded-hal-nb      = { version = "=1.0.0-alpha.2", optional = true }
 esp-synopsys-usb-otg = { version = "0.3.1", optional = true, features = ["fs", "esp32sx"] }
 fugit                = "0.3.6"
+log                  = "0.4.17"
 lock_api             = { version = "0.4.9", optional = true }
 nb                   = "1.1.0"
 paste                = "1.0.12"

diff --git a/esp-hal-common/devices/esp32.toml b/esp-hal-common/devices/esp32.toml
@@ -56,6 +56,7 @@ peripherals = [
     "phy",
     "bt",
     "wifi",
+    "psram",
 
     # Wakeup SOC based on ESP-IDF:
     "pm_support_ext0_wakeup",

diff --git a/esp-hal-common/src/interrupt/riscv.rs b/esp-hal-common/src/interrupt/riscv.rs
@@ -527,8 +527,6 @@ pub fn _setup_interrupts() {
     unsafe {
         core::arch::asm!("csrw mie, {0}", in(reg) u32::MAX);
     }
-
-    crate::common_init();
 }
 
 /// Disable the given peripheral interrupt.

diff --git a/esp-hal-common/src/lib.rs b/esp-hal-common/src/lib.rs
@@ -152,12 +152,6 @@ pub fn disable_apm_filter() {
     }
 }
 
-#[doc(hidden)]
-pub fn common_init() {
-    #[cfg(psram)]
-    soc::psram::init_psram();
-}
-
 /// Enumeration of CPU cores
 /// The actual number of available cores depends on the target.
 pub enum Cpu {

diff --git a/esp-hal-common/src/soc/esp32/mod.rs b/esp-hal-common/src/soc/esp32/mod.rs
@@ -2,4 +2,6 @@ pub mod cpu_control;
 pub mod efuse;
 pub mod gpio;
 pub mod peripherals;
+#[cfg(psram)]
+pub mod psram;
 pub mod radio_clocks;
diff --git a/esp-hal-common/src/soc/esp32/peripherals.rs b/esp-hal-common/src/soc/esp32/peripherals.rs
@@ -49,5 +49,6 @@ crate::peripherals! {
     UART2 => true,
     UHCI0 => true,
     UHCI1 => true,
-    RADIO => false
+    RADIO => false,
+    PSRAM => false,
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ peripherals = [ @@
         "phy",
         "bt",
         "wifi",
+        "psram",
         # Wakeup SOC based on ESP-IDF:
         "pm_support_ext0_wakeup",
@@ Expand Down @@