Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ldgen_ignore_nonexistent_archives_and_obj' into 'master'

Browse Source 
ldgen: check mappings

Closes IDF-1624

See merge request espressif/esp-idf!8557
This commit is contained in:
Angus Gratton
2021-01-21 15:59:35 +08:00
parent 3a732f1e52 d1c800fbbb
commit 3532f52f60
25 changed files with 176 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/app_trace/linker.lf
+5 -4
View File
@@ -3,10 +3,11 @@ archive: libapp_trace.a
entries:
app_trace (noflash)
app_trace_util (noflash)
SEGGER_SYSVIEW (noflash)
SEGGER_RTT_esp32 (noflash)
SEGGER_SYSVIEW_Config_FreeRTOS (noflash)
SEGGER_SYSVIEW_FreeRTOS (noflash)
if SYSVIEW_ENABLE = y:
SEGGER_SYSVIEW (noflash)
SEGGER_RTT_esp32 (noflash)
SEGGER_SYSVIEW_Config_FreeRTOS (noflash)
SEGGER_SYSVIEW_FreeRTOS (noflash)
[mapping:driver]
archive: libdriver.a
components/esp_hw_support/linker.lf
+2 -2
View File
@@ -6,8 +6,8 @@ entries:
regi2c_ctrl (noflash)
rtc_clk (noflash)
rtc_init:rtc_vddsdio_set_config (noflash)
rtc_periph (noflash_text)
rtc_pm (noflash_text)
rtc_sleep (noflash_text)
rtc_time (noflash_text)
rtc_wdt (noflash_text)
if IDF_TARGET_ESP32C3 = n:
rtc_wdt (noflash_text)
components/esp_hw_support/port/esp32s3/CMakeLists.txt
+2 -1
View File
@@ -7,7 +7,8 @@ set(srcs
"rtc_init.c"
"rtc_pm.c"
"rtc_sleep.c"
"rtc_time.c")
"rtc_time.c"
"rtc_wdt.c")
add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
components/soc/esp32s2/rtc_periph.c → components/esp_hw_support/port/esp32s3/rtc_wdt.c
-2
View File
@@ -11,5 +11,3 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "soc/rtc_periph.h"
components/esp_pm/linker.lf
+8 -6
View File
@@ -36,12 +36,14 @@ entries:
archive: libesp_timer.a
entries:
if PM_SLP_IRAM_OPT = y:
esp_timer_impl_lac:esp_timer_impl_lock (noflash)
esp_timer_impl_lac:esp_timer_impl_unlock (noflash)
esp_timer_impl_lac:esp_timer_impl_advance (noflash)
esp_timer_impl_systimer:esp_timer_impl_lock (noflash)
esp_timer_impl_systimer:esp_timer_impl_unlock (noflash)
esp_timer_impl_systimer:esp_timer_impl_advance (noflash)
if ESP_TIMER_IMPL_TG0_LAC = y:
esp_timer_impl_lac:esp_timer_impl_lock (noflash)
esp_timer_impl_lac:esp_timer_impl_unlock (noflash)
esp_timer_impl_lac:esp_timer_impl_advance (noflash)
elif ESP_TIMER_IMPL_SYSTIMER = y:
esp_timer_impl_systimer:esp_timer_impl_lock (noflash)
esp_timer_impl_systimer:esp_timer_impl_unlock (noflash)
esp_timer_impl_systimer:esp_timer_impl_advance (noflash)
[mapping:newlib_pm]
archive: libnewlib.a
components/esp_system/linker.lf
-4
View File
@@ -6,10 +6,6 @@ entries:
panic_arch (noflash)
reset_reason (noflash)
system_api:esp_system_abort (noflash)
startup:do_core_init (default)
startup:do_secondary_init (default)
startup:start_cpu0_default (default)
if ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF:
usb_console:esp_usb_console_write_char (noflash)
components/espcoredump/linker.lf
+2 -4
View File
@@ -19,13 +19,11 @@ entries:
else:
* (default)
[mapping:mbedtls]
archive: libmbedtls.a
[mapping:sha256_coredump]
archive: libmbedcrypto.a
entries:
if ESP_COREDUMP_CHECKSUM_SHA256 = y :
if MBEDTLS_HARDWARE_SHA = n:
sha256 (noflash_text)
else:
esp_sha256 (noflash_text)
else:
* (default)
components/freertos/linker.lf
+19 -13
View File
@@ -2,25 +2,25 @@
archive: libfreertos.a
entries:
* (noflash_text)
queue:xQueueGenericCreateStatic (default)
if FREERTOS_PLACE_FUNCTIONS_INTO_FLASH = y:
port: pxPortInitialiseStack (default)
port: xPortStartScheduler (default)
port: vPortStoreTaskMPUSettings (default)
port: vPortReleaseTaskMPUSettings (default)
if ESP_PANIC_HANDLER_IRAM != y:
tasks: uxTaskGetSnapshotAll (default)
tasks: prvTaskGetSnapshot (default)
tasks: prvTaskGetSnapshotsFromList (default)
if IDF_TARGET_ESP32S2 =n && IDF_TARGET_ESP32C3 = n :
port: vPortReleaseTaskMPUSettings (default)
tasks: xTaskCreateRestricted (default)
port: vPortStoreTaskMPUSettings (default)
tasks: vTaskAllocateMPURegions (default)
tasks: prvTaskCheckFreeStackSpace (default)
tasks: prvListTaskWithinSingleList (default)
tasks: prvInitialiseNewTask (default)
tasks: prvInitialiseTaskLists (default)
tasks: prvDeleteTCB (default)
tasks: prvCheckTasksWaitingTermination (default)
tasks: prvIdleTask (default)
tasks: prvAddNewTaskToReadyList (default)
tasks: xTaskCreateStaticPinnedToCore (default)
tasks: xTaskCreatePinnedToCore (default)
tasks: vTaskResume (default)
tasks: vTaskStartScheduler (default)
@@ -44,16 +44,14 @@ entries:
tasks: uxTaskResetEventItemValue (default)
tasks: ulTaskNotifyTake (default)
tasks: xTaskNotifyWait (default)
tasks: xTaskNotify (default)
tasks: xTaskGenericNotify (default)
tasks: eTaskGetState (default)
tasks: pxTaskGetStackStart (default)
tasks: uxTaskGetStackHighWaterMark (default)
tasks: vTaskAllocateMPURegions (default)
tasks: vTaskEndScheduler (default)
tasks: vTaskList (default)
tasks: vTaskMissedYield (default)
tasks: vTaskSetThreadLocalStoragePointer (default)
tasks: xTaskCreateRestricted (default)
tasks: xTaskGetAffinity (default)
tasks: xTaskGetIdleTaskHandleForCPU (default)
timers: prvInsertTimerInActiveList (default)
@@ -67,7 +65,6 @@ entries:
timers: prvProcessReceivedCommands (default)
timers: xTimerCreateTimerTask (default)
timers: xTimerCreate (default)
timers: xTimerCreateStatic (default)
timers: xTimerGenericCommand (default)
timers: xTimerGetPeriod (default)
timers: xTimerGetExpiryTime (default)
@@ -76,7 +73,6 @@ entries:
timers: vTimerSetTimerID (default)
timers: prvGetNextExpireTime (default)
event_groups: prvTestWaitCondition (default)
event_groups: xEventGroupCreateStatic (default)
event_groups: xEventGroupCreate (default)
event_groups: xEventGroupWaitBits (default)
event_groups: xEventGroupClearBits (default)
@@ -90,11 +86,9 @@ entries:
queue: xQueueGenericReset (default)
queue: xQueueGenericCreate (default)
queue: xQueueGetMutexHolder (default)
queue: xQueueCreateCountingSemaphoreStatic (default)
queue: xQueueCreateCountingSemaphore (default)
queue: xQueueGenericSend (default)
queue: xQueueCreateMutex (default)
queue: xQueueCreateMutexStatic (default)
queue: xQueueGiveMutexRecursive (default)
queue: xQueueTakeMutexRecursive (default)
queue: uxQueueMessagesWaiting (default)
@@ -112,4 +106,16 @@ entries:
queue: xQueueSelectFromSet (default)
port_common:main_task (default)
port:esp_startup_start_app (default)
port:esp_startup_start_app_other_cores (default)
if ESP_SYSTEM_SINGLE_CORE_MODE = n:
port:esp_startup_start_app_other_cores (default)
if FREERTOS_SUPPORT_STATIC_ALLOCATION = y && FREERTOS_PLACE_FUNCTIONS_INTO_FLASH = y:
[mapping:freertos_static]
archive: libfreertos.a
entries:
queue:xQueueGenericCreateStatic (default)
queue: xQueueCreateCountingSemaphoreStatic (default)
tasks: xTaskCreateStaticPinnedToCore (default)
timers: xTimerCreateStatic (default)
event_groups: xEventGroupCreateStatic (default)
queue: xQueueCreateMutexStatic (default)
components/hal/linker.lf
+8 -6
View File
@@ -10,12 +10,14 @@ entries:
spi_flash_hal_iram (noflash)
ledc_hal_iram (noflash)
i2c_hal_iram (noflash)
spi_flash_hal_gpspi (noflash)
cpu_hal (noflash)
soc_hal (noflash)
wdt_hal_iram (noflash)
systimer_hal (noflash)
if TWAI_ISR_IN_IRAM = y:
twai_hal_iram (noflash)
else:
twai_hal_iram (default)
if IDF_TARGET_ESP32C3 = n:
if TWAI_ISR_IN_IRAM = y:
twai_hal_iram (noflash)
else:
twai_hal_iram (default)
if IDF_TARGET_ESP32 = n:
spi_flash_hal_gpspi (noflash)
systimer_hal (noflash)
components/heap/linker.lf
+2 -1
View File
@@ -3,4 +3,5 @@ archive: libheap.a
entries:
heap_tlsf (noflash)
multi_heap (noflash)
multi_heap_poisoning (noflash)
if HEAP_POISONING_DISABLED = n:
multi_heap_poisoning (noflash)
components/lwip/linker.lf
-1
View File
@@ -62,7 +62,6 @@ entries:
pbuf:pbuf_header_impl (noflash_text)
pbuf:pbuf_header (noflash_text)
pbuf:pbuf_free (noflash_text)
timeouts:sys_timeouts_mbox_fetch (noflash_text)
udp:udp_input_local_match (noflash_text)
udp:udp_input (noflash_text)
udp:udp_send (noflash_text)
components/soc/esp32/CMakeLists.txt
-1
View File
@@ -9,7 +9,6 @@ set(srcs
"pcnt_periph.c"
"rmt_periph.c"
"rtc_io_periph.c"
"rtc_periph.c"
"sdio_slave_periph.c"
"sdmmc_periph.c"
"sigmadelta_periph.c"
components/soc/esp32/rtc_periph.c
View File
components/soc/esp32s2/CMakeLists.txt
-1
View File
@@ -10,7 +10,6 @@ set(srcs
"pcnt_periph.c"
"rmt_periph.c"
"rtc_io_periph.c"
"rtc_periph.c"
"sigmadelta_periph.c"
"soc_memory_layout.c"
"spi_periph.c"
components/soc/esp32s3/CMakeLists.txt
-1
View File
@@ -11,7 +11,6 @@ set(srcs
"pcnt_periph.c"
"rmt_periph.c"
"rtc_io_periph.c"
"rtc_periph.c"
"sdio_slave_periph.c"
"sdmmc_periph.c"
"sigmadelta_periph.c"
components/soc/esp32s3/rtc_periph.c
View File
components/xtensa/linker.lf
+2 -1
View File
@@ -2,7 +2,8 @@
archive: libxtensa.a
entries:
eri (noflash_text)
stdatomic (noflash)
if IDF_TARGET_ESP32S2 = y:
stdatomic (noflash)
[mapping:xt_hal]
archive: libxt_hal.a