diff --git a/components/app_trace/linker.lf b/components/app_trace/linker.lf
index a30377b8ee..08cd419a5b 100644
--- a/components/app_trace/linker.lf
+++ b/components/app_trace/linker.lf
@@ -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
diff --git a/components/freertos/linker.lf b/components/freertos/linker.lf
index a2275ecd62..914c4ba0dd 100644
--- a/components/freertos/linker.lf
+++ b/components/freertos/linker.lf
@@ -2,4 +2,7 @@
 archive: libfreertos.a
 entries:
     * (noflash_text)
+    if FREERTOS_SUPPORT_STATIC_ALLOCATION = y:
+        queue:xQueueGenericCreateStatic (default)
+
 
diff --git a/components/heap/linker.lf b/components/heap/linker.lf
index 2d996e62e4..56c5bd8ae6 100644
--- a/components/heap/linker.lf
+++ b/components/heap/linker.lf
@@ -2,4 +2,6 @@
 archive: libheap.a
 entries:
     multi_heap (noflash)
-    multi_heap_poisoning (noflash)
\ No newline at end of file
+    if HEAP_POISONING_DISABLED = n:
+        multi_heap_poisoning (noflash)
+
diff --git a/components/lwip/linker.lf b/components/lwip/linker.lf
index ec48930ea7..6469dbeae7 100644
--- a/components/lwip/linker.lf
+++ b/components/lwip/linker.lf
@@ -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)
diff --git a/components/soc/esp32s2beta/rtc_periph.c b/components/soc/esp32s2beta/rtc_periph.c
index 72b0de6ec5..d95ec54695 100644
--- a/components/soc/esp32s2beta/rtc_periph.c
+++ b/components/soc/esp32s2beta/rtc_periph.c
@@ -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"
diff --git a/components/soc/linker.lf b/components/soc/linker.lf
index 44d8ed3db1..f458173574 100644
--- a/components/soc/linker.lf
+++ b/components/soc/linker.lf
@@ -5,7 +5,6 @@ entries:
     rtc_clk (noflash)
     rtc_clk_init (noflash_text)
     rtc_init (noflash_text)
-    rtc_periph (noflash_text)
     rtc_pm (noflash_text)
     rtc_sleep (noflash_text)
     rtc_time (noflash_text)
@@ -19,9 +18,8 @@ entries:
     spi_flash_hal_iram (noflash)
     ledc_hal_iram (noflash_text)
     i2c_hal_iram (noflash)
-    spi_flash_hal_gpspi (noflash)
     lldesc (noflash_text)
     if CAN_ISR_IN_IRAM = y:
         can_hal_iram (noflash)
     else:
-        can_hal_iram (default)
\ No newline at end of file
+        can_hal_iram (default)
diff --git a/tools/ci/check_ldgen_mapping_exceptions.txt b/tools/ci/check_ldgen_mapping_exceptions.txt
index 86370cb96e..eebfb1cd7c 100644
--- a/tools/ci/check_ldgen_mapping_exceptions.txt
+++ b/tools/ci/check_ldgen_mapping_exceptions.txt
@@ -1,2 +1,3 @@
 libc
 sha256_coredump
+gcc
diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml
index 079c3257bd..ffed2167e7 100644
--- a/tools/ci/config/build.yml
+++ b/tools/ci/config/build.yml
@@ -58,7 +58,7 @@ build_esp_idf_tests_make:
   extends: .build_esp_idf_unit_test_template
   variables:
     PYTHON_VER: 3
-    LDGEN_CHECK_MAPPING: 0
+    LDGEN_CHECK_MAPPING: 1
   script:
     - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
     - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
@@ -109,7 +109,7 @@ build_examples_make:
       - $LOG_PATH
     expire_in: 4 days
   variables:
-    LDGEN_CHECK_MAPPING: 0
+    LDGEN_CHECK_MAPPING: 1
     LOG_PATH: "$CI_PROJECT_DIR/log_examples_make"
   only:
     # Here both 'variables' and 'refs' conditions are given. They are combined with "AND" logic.