Skip to content

Commit 3058e24

Browse files
committed
Merge branch 'feature/lp_core_c5_eco2' into 'master'
feat(ulp): update ulp for c5 eco2 Closes IDF-8637 See merge request espressif/esp-idf!38431
2 parents e5a8ea0 + 2fbbcc6 commit 3058e24

File tree

7 files changed

+22
-8
lines changed

7 files changed

+22
-8
lines changed

components/soc/esp32c5/include/soc/Kconfig.soc_caps.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,3 +1762,7 @@ config SOC_LP_CORE_SINGLE_INTERRUPT_VECTOR
17621762
config SOC_LP_CORE_SUPPORT_ETM
17631763
bool
17641764
default y
1765+
1766+
config SOC_LP_CORE_SUPPORT_STORE_LOAD_EXCEPTIONS
1767+
bool
1768+
default y

components/soc/esp32c5/include/soc/soc_caps.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,5 +691,6 @@
691691
// #define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/
692692

693693
/*------------------------------------- ULP CAPS -------------------------------------*/
694-
#define SOC_LP_CORE_SINGLE_INTERRUPT_VECTOR (1) /*!< LP Core interrupts all map to a single entry in vector table */
695-
#define SOC_LP_CORE_SUPPORT_ETM (1) /*!< LP Core supports ETM */
694+
#define SOC_LP_CORE_SINGLE_INTERRUPT_VECTOR (1) /*!< LP Core interrupts all map to a single entry in vector table */
695+
#define SOC_LP_CORE_SUPPORT_ETM (1) /*!< LP Core supports ETM */
696+
#define SOC_LP_CORE_SUPPORT_STORE_LOAD_EXCEPTIONS (1) /*!< LP Core will raise exceptions if accessing invalid addresses */

components/soc/esp32p4/include/soc/Kconfig.soc_caps.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2194,3 +2194,7 @@ config SOC_LP_CORE_SUPPORT_LP_ADC
21942194
config SOC_LP_CORE_SUPPORT_LP_VAD
21952195
bool
21962196
default y
2197+
2198+
config SOC_LP_CORE_SUPPORT_STORE_LOAD_EXCEPTIONS
2199+
bool
2200+
default y

components/soc/esp32p4/include/soc/soc_caps.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,7 @@
811811
#define SOC_I3C_MASTER_COMMAND_TABLE_NUM (12)
812812

813813
/*------------------------------------- ULP CAPS -------------------------------------*/
814-
#define SOC_LP_CORE_SUPPORT_ETM (1) /*!< LP Core supports ETM */
815-
#define SOC_LP_CORE_SUPPORT_LP_ADC (1) /*!< LP ADC can be accessed from the LP-Core */
816-
#define SOC_LP_CORE_SUPPORT_LP_VAD (1) /*!< LP VAD can be accessed from the LP-Core */
814+
#define SOC_LP_CORE_SUPPORT_ETM (1) /*!< LP Core supports ETM */
815+
#define SOC_LP_CORE_SUPPORT_LP_ADC (1) /*!< LP ADC can be accessed from the LP-Core */
816+
#define SOC_LP_CORE_SUPPORT_LP_VAD (1) /*!< LP VAD can be accessed from the LP-Core */
817+
#define SOC_LP_CORE_SUPPORT_STORE_LOAD_EXCEPTIONS (1) /*!< LP Core will raise exceptions if accessing invalid addresses */

components/ulp/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ menu "Ultra Low Power (ULP) Co-processor"
9797
depends on ULP_COPROC_TYPE_LP_CORE && SOC_ULP_LP_UART_SUPPORTED
9898
bool
9999
prompt "Enable panic handler which outputs over LP UART"
100-
default "y" if IDF_TARGET_ESP32P4
100+
default "y" if SOC_LP_CORE_SUPPORT_STORE_LOAD_EXCEPTIONS
101101
help
102102
Set this option to enable panic handler functionality. If this option is
103103
enabled then the LP Core will output a panic dump over LP UART,

examples/system/.build-test-rules.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ examples/system/ulp/lp_core/build_system:
273273
examples/system/ulp/lp_core/debugging:
274274
enable:
275275
- if: SOC_LP_CORE_SUPPORTED == 1
276+
disable:
277+
- if: IDF_TARGET == "esp32c5"
278+
temporary: true
279+
reason: binary size too large TODO IDF-13063
276280
depends_components:
277281
- ulp
278282

examples/system/ulp/lp_core/debugging/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32-C5 | ESP32-C6 | ESP32-P4 |
2-
| ----------------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32-C6 | ESP32-P4 |
2+
| ----------------- | -------- | -------- |
33

44
# LP Core Debugging Example
55

0 commit comments

Comments
 (0)