Skip to content

Commit 65ef909

Browse files
committed
Revert "change(soc): fix idf_size error caused by ldgen to run success for ci pipeline"
This reverts commit bd19d4b.
1 parent 5a0e161 commit 65ef909

File tree

11 files changed

+12
-18
lines changed

11 files changed

+12
-18
lines changed

components/esp_hw_support/linker.lf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ archive: libsoc.a
4848
entries:
4949
if PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP && ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND:
5050
gpio_periph: GPIO_HOLD_MASK (noflash)
51+
if PM_SLP_IRAM_OPT = y && SOC_TEMP_SENSOR_SUPPORTED = y:
52+
temperature_sensor_periph:temperature_sensor_attributes (noflash)

components/soc/esp32c2/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
*/
66

77
#include "soc/temperature_sensor_periph.h"
8-
#include "esp_attr.h"
98

10-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
9+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1110
/*Offset reg_val min max error */
1211
{-2, 5, 50, 125, 3},
1312
{-1, 7, 20, 100, 2},

components/soc/esp32c3/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
*/
66

77
#include "soc/temperature_sensor_periph.h"
8-
#include "esp_attr.h"
98

10-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
9+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1110
/*Offset reg_val min max error */
1211
{-2, 5, 50, 125, 3},
1312
{-1, 7, 20, 100, 2},

components/soc/esp32c5/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#include "soc/regdma.h"
99
#include "soc/temperature_sensor_periph.h"
1010
#include "soc/apb_saradc_reg.h"
11-
#include "esp_attr.h"
1211

13-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
12+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1413
/*Offset reg_val min max error */
1514
{-2, 5, 50, 125, 3},
1615
{-1, 7, 20, 100, 2},

components/soc/esp32c6/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#include "soc/regdma.h"
99
#include "soc/temperature_sensor_periph.h"
1010
#include "soc/apb_saradc_reg.h"
11-
#include "esp_attr.h"
1211

13-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
12+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1413
/*Offset reg_val min max error */
1514
{-2, 5, 50, 125, 3},
1615
{-1, 7, 20, 100, 2},

components/soc/esp32c61/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#include "soc/regdma.h"
99
#include "soc/temperature_sensor_periph.h"
1010
#include "soc/apb_saradc_reg.h"
11-
#include "esp_attr.h"
1211

13-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
12+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1413
/*Offset reg_val min max error */
1514
{-2, 5, 50, 125, 3},
1615
{-1, 7, 20, 100, 2},

components/soc/esp32h2/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#include "soc/regdma.h"
99
#include "soc/temperature_sensor_periph.h"
1010
#include "soc/apb_saradc_reg.h"
11-
#include "esp_attr.h"
1211

13-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
12+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1413
/*Offset reg_val min max error */
1514
{-2, 5, 50, 125, 3},
1615
{-1, 7, 20, 100, 2},

components/soc/esp32p4/temperature_sensor_periph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "soc/temperature_sensor_periph.h"
88

9-
temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
9+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1010
/*Offset reg_val min max error */
1111
{-2, 5, 50, 125, 3},
1212
{-1, 7, 20, 100, 2},

components/soc/esp32s2/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
*/
66

77
#include "soc/temperature_sensor_periph.h"
8-
#include "esp_attr.h"
98

10-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
9+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1110
/*Offset reg_val min max error */
1211
{-2, 5, 50, 125, 3},
1312
{-1, 7, 20, 100, 2},

components/soc/esp32s3/temperature_sensor_periph.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
*/
66

77
#include "soc/temperature_sensor_periph.h"
8-
#include "esp_attr.h"
98

10-
DRAM_ATTR temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
9+
const temperature_sensor_attribute_t temperature_sensor_attributes[TEMPERATURE_SENSOR_ATTR_RANGE_NUM] = {
1110
/*Offset reg_val min max error */
1211
{-2, 5, 50, 125, 3},
1312
{-1, 7, 20, 100, 2},

0 commit comments

Comments
 (0)