From 90ee405afd3e6d85047d9c7703f7ec0e97ac0b48 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Tue, 19 Mar 2019 14:19:39 +0800 Subject: [PATCH] ldgen: update component linker fragment files --- components/app_trace/linker.lf | 13 +- components/esp32/linker.lf | 6 +- components/esp_ringbuf/linker.lf | 2 +- components/esp_wifi/linker.lf | 17 +- components/espcoredump/linker.lf | 2 +- components/freertos/linker.lf | 2 +- components/heap/linker.lf | 2 +- components/lwip/linker.lf | 6 +- .../newlib/esp32-spiram-rom-functions.lf | 264 +++++++++--------- components/soc/linker.lf | 2 +- components/spi_flash/linker.lf | 2 +- components/vfs/test/linker.lf | 2 +- components/xtensa/linker.lf | 4 +- tools/ldgen/samples/mappings.lf | 24 +- 14 files changed, 176 insertions(+), 172 deletions(-) diff --git a/components/app_trace/linker.lf b/components/app_trace/linker.lf index a10982995..a30377b8e 100644 --- a/components/app_trace/linker.lf +++ b/components/app_trace/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:app_trace] archive: libapp_trace.a entries: app_trace (noflash) @@ -8,10 +8,11 @@ entries: SEGGER_SYSVIEW_Config_FreeRTOS (noflash) SEGGER_SYSVIEW_FreeRTOS (noflash) -[mapping] +[mapping:driver] archive: libdriver.a entries: - : SYSVIEW_TS_SOURCE_TIMER_00 = y || SYSVIEW_TS_SOURCE_TIMER_01 = y - || SYSVIEW_TS_SOURCE_TIMER_10 = y || SYSVIEW_TS_SOURCE_TIMER_11 = y - timer (noflash) - + if SYSVIEW_TS_SOURCE_TIMER_00 = y || SYSVIEW_TS_SOURCE_TIMER_01 = y + || SYSVIEW_TS_SOURCE_TIMER_10 = y || SYSVIEW_TS_SOURCE_TIMER_11 = y: + timer (noflash) + else: + * (default) diff --git a/components/esp32/linker.lf b/components/esp32/linker.lf index c6575dc66..b7bb89f6e 100644 --- a/components/esp32/linker.lf +++ b/components/esp32/linker.lf @@ -1,14 +1,14 @@ -[mapping] +[mapping:esp32] archive: libesp32.a entries: panic (noflash) -[mapping] +[mapping:gcc] archive: libgcc.a entries: lib2funcs (noflash_text) -[mapping] +[mapping:gcov] archive: libgcov.a entries: * (noflash) diff --git a/components/esp_ringbuf/linker.lf b/components/esp_ringbuf/linker.lf index 374aa4ce7..6250616e1 100644 --- a/components/esp_ringbuf/linker.lf +++ b/components/esp_ringbuf/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:esp_ringbuf] archive: libesp_ringbuf.a entries: * (noflash_text) \ No newline at end of file diff --git a/components/esp_wifi/linker.lf b/components/esp_wifi/linker.lf index 4c01c3135..a322d395a 100644 --- a/components/esp_wifi/linker.lf +++ b/components/esp_wifi/linker.lf @@ -1,22 +1,21 @@ -[mapping] +[mapping:phy] archive: libphy.a entries: * (noflash_data) -[mapping] +[mapping:rtc] archive: librtc.a entries: * (noflash_text) -[mapping] +[mapping:pp] archive: libpp.a entries: - : ESP32_WIFI_IRAM_OPT = y - * (wifi_iram) + if ESP32_WIFI_IRAM_OPT = y: + * (wifi_iram) -[mapping] +[mapping:net80211] archive: libnet80211.a entries: - : ESP32_WIFI_IRAM_OPT = y - * (wifi_iram) - + if ESP32_WIFI_IRAM_OPT = y: + * (wifi_iram) diff --git a/components/espcoredump/linker.lf b/components/espcoredump/linker.lf index 30d13caef..02dd9cfe7 100644 --- a/components/espcoredump/linker.lf +++ b/components/espcoredump/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:espcoredump] archive: libespcoredump.a entries: core_dump_uart (noflash_text) diff --git a/components/freertos/linker.lf b/components/freertos/linker.lf index 93092b7e8..a2275ecd6 100644 --- a/components/freertos/linker.lf +++ b/components/freertos/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:freertos] archive: libfreertos.a entries: * (noflash_text) diff --git a/components/heap/linker.lf b/components/heap/linker.lf index fc79148ac..2d996e62e 100644 --- a/components/heap/linker.lf +++ b/components/heap/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:heap] archive: libheap.a entries: multi_heap (noflash) diff --git a/components/lwip/linker.lf b/components/lwip/linker.lf index 162a4c11d..b4d47cb54 100644 --- a/components/lwip/linker.lf +++ b/components/lwip/linker.lf @@ -1,7 +1,7 @@ -[mapping] +[mapping:lwip] archive: liblwip.a entries: - :LWIP_IRAM_OPTIMIZATION = y + if LWIP_IRAM_OPTIMIZATION = y: ethernetif:ethernet_low_level_output (noflash_text) ethernetif:ethernetif_input (noflash_text) wlanif:low_level_output (noflash_text) @@ -55,3 +55,5 @@ entries: pbuf:pbuf_header_impl (noflash_text) pbuf:pbuf_header (noflash_text) ethernet:ethernet_input (noflash_text) + else: + * (default) diff --git a/components/newlib/esp32-spiram-rom-functions.lf b/components/newlib/esp32-spiram-rom-functions.lf index d741395d9..216fb0590 100644 --- a/components/newlib/esp32-spiram-rom-functions.lf +++ b/components/newlib/esp32-spiram-rom-functions.lf @@ -8,137 +8,139 @@ # Note: We currently never link libg-psram-workaround.a, so no rules # are generated for this library -[mapping] +[mapping:libc_psram_workaround] archive: libc-psram-workaround.a entries: - : SPIRAM_CACHE_WORKAROUND = y - lib_a-utoa (noflash) - lib_a-longjmp (noflash) - lib_a-setjmp (noflash) - lib_a-abs (noflash) - lib_a-div (noflash) - lib_a-labs (noflash) - lib_a-ldiv (noflash) - lib_a-quorem (noflash) - lib_a-utoa (noflash) - lib_a-itoa (noflash) - lib_a-atoi (noflash) - lib_a-atol (noflash) - lib_a-strtol (noflash) - lib_a-strtoul (noflash) - lib_a-wcrtomb (noflash) - lib_a-fvwrite (noflash) - lib_a-wbuf (noflash) - lib_a-wsetup (noflash) - lib_a-fputwc (noflash) - lib_a-wctomb_r (noflash) - lib_a-ungetc (noflash) - lib_a-makebuf (noflash) - lib_a-fflush (noflash) - lib_a-refill (noflash) - lib_a-s_fpclassify (noflash) - lib_a-asctime (noflash) - lib_a-ctime (noflash) - lib_a-ctime_r (noflash) - lib_a-lcltime (noflash) - lib_a-lcltime_r (noflash) - lib_a-gmtime (noflash) - lib_a-gmtime_r (noflash) - lib_a-strftime (noflash) - lib_a-mktime (noflash) - lib_a-syswrite (noflash) - lib_a-tzset_r (noflash) - lib_a-tzset (noflash) - lib_a-toupper (noflash) - lib_a-tolower (noflash) - lib_a-toascii (noflash) - lib_a-systimes (noflash) - lib_a-time (noflash) - lib_a-gettzinfo (noflash) - lib_a-strupr (noflash) - lib_a-asctime_r (noflash) - lib_a-bzero (noflash) - lib_a-close (noflash) - lib_a-creat (noflash) - lib_a-environ (noflash) - lib_a-fclose (noflash) - lib_a-isalnum (noflash) - lib_a-isalpha (noflash) - lib_a-isascii (noflash) - lib_a-isblank (noflash) - lib_a-iscntrl (noflash) - lib_a-isdigit (noflash) - lib_a-isgraph (noflash) - lib_a-islower (noflash) - lib_a-isprint (noflash) - lib_a-ispunct (noflash) - lib_a-isspace (noflash) - lib_a-isupper (noflash) - lib_a-memccpy (noflash) - lib_a-memchr (noflash) - lib_a-memcmp (noflash) - lib_a-memcpy (noflash) - lib_a-memmove (noflash) - lib_a-memrchr (noflash) - lib_a-memset (noflash) - lib_a-open (noflash) - lib_a-rand (noflash) - lib_a-rand_r (noflash) - lib_a-read (noflash) - lib_a-rshift (noflash) - lib_a-sbrk (noflash) - lib_a-srand (noflash) - lib_a-strcasecmp (noflash) - lib_a-strcasestr (noflash) - lib_a-strcat (noflash) - lib_a-strchr (noflash) - lib_a-strcmp (noflash) - lib_a-strcoll (noflash) - lib_a-strcpy (noflash) - lib_a-strcspn (noflash) - lib_a-strdup (noflash) - lib_a-strlcat (noflash) - lib_a-strlcpy (noflash) - lib_a-strlen (noflash) - lib_a-strlwr (noflash) - lib_a-strncasecmp (noflash) - lib_a-strncat (noflash) - lib_a-strncmp (noflash) - lib_a-strncpy (noflash) - lib_a-strndup (noflash) - lib_a-strnlen (noflash) - lib_a-strrchr (noflash) - lib_a-strsep (noflash) - lib_a-strspn (noflash) - lib_a-strstr (noflash) - lib_a-strtok_r (noflash) - lib_a-strupr (noflash) - lib_a-stdio (noflash) - lib_a-syssbrk (noflash) - lib_a-sysclose (noflash) - lib_a-sysopen (noflash) - creat (noflash) - lib_a-sysread (noflash) - lib_a-syswrite (noflash) - lib_a-impure (noflash) - lib_a-tzvars (noflash) - lib_a-sf_nan (noflash) - lib_a-tzcalc_limits (noflash) - lib_a-month_lengths (noflash) - lib_a-timelocal (noflash) - lib_a-findfp (noflash) - lock (noflash) - lib_a-getenv_r (noflash) - isatty (noflash) - lib_a-fwalk (noflash) - lib_a-getenv_r (noflash) - lib_a-tzlock (noflash) - lib_a-ctype_ (noflash) - lib_a-sccl (noflash) - lib_a-strptime (noflash) - lib_a-envlock (noflash) - lib_a-raise (noflash) - lib_a-strdup_r (noflash) - lib_a-system (noflash) - lib_a-strndup_r (noflash) + if SPIRAM_CACHE_WORKAROUND = y: + lib_a-utoa (noflash) + lib_a-longjmp (noflash) + lib_a-setjmp (noflash) + lib_a-abs (noflash) + lib_a-div (noflash) + lib_a-labs (noflash) + lib_a-ldiv (noflash) + lib_a-quorem (noflash) + lib_a-utoa (noflash) + lib_a-itoa (noflash) + lib_a-atoi (noflash) + lib_a-atol (noflash) + lib_a-strtol (noflash) + lib_a-strtoul (noflash) + lib_a-wcrtomb (noflash) + lib_a-fvwrite (noflash) + lib_a-wbuf (noflash) + lib_a-wsetup (noflash) + lib_a-fputwc (noflash) + lib_a-wctomb_r (noflash) + lib_a-ungetc (noflash) + lib_a-makebuf (noflash) + lib_a-fflush (noflash) + lib_a-refill (noflash) + lib_a-s_fpclassify (noflash) + lib_a-asctime (noflash) + lib_a-ctime (noflash) + lib_a-ctime_r (noflash) + lib_a-lcltime (noflash) + lib_a-lcltime_r (noflash) + lib_a-gmtime (noflash) + lib_a-gmtime_r (noflash) + lib_a-strftime (noflash) + lib_a-mktime (noflash) + lib_a-syswrite (noflash) + lib_a-tzset_r (noflash) + lib_a-tzset (noflash) + lib_a-toupper (noflash) + lib_a-tolower (noflash) + lib_a-toascii (noflash) + lib_a-systimes (noflash) + lib_a-time (noflash) + lib_a-gettzinfo (noflash) + lib_a-strupr (noflash) + lib_a-asctime_r (noflash) + lib_a-bzero (noflash) + lib_a-close (noflash) + lib_a-creat (noflash) + lib_a-environ (noflash) + lib_a-fclose (noflash) + lib_a-isalnum (noflash) + lib_a-isalpha (noflash) + lib_a-isascii (noflash) + lib_a-isblank (noflash) + lib_a-iscntrl (noflash) + lib_a-isdigit (noflash) + lib_a-isgraph (noflash) + lib_a-islower (noflash) + lib_a-isprint (noflash) + lib_a-ispunct (noflash) + lib_a-isspace (noflash) + lib_a-isupper (noflash) + lib_a-memccpy (noflash) + lib_a-memchr (noflash) + lib_a-memcmp (noflash) + lib_a-memcpy (noflash) + lib_a-memmove (noflash) + lib_a-memrchr (noflash) + lib_a-memset (noflash) + lib_a-open (noflash) + lib_a-rand (noflash) + lib_a-rand_r (noflash) + lib_a-read (noflash) + lib_a-rshift (noflash) + lib_a-sbrk (noflash) + lib_a-srand (noflash) + lib_a-strcasecmp (noflash) + lib_a-strcasestr (noflash) + lib_a-strcat (noflash) + lib_a-strchr (noflash) + lib_a-strcmp (noflash) + lib_a-strcoll (noflash) + lib_a-strcpy (noflash) + lib_a-strcspn (noflash) + lib_a-strdup (noflash) + lib_a-strlcat (noflash) + lib_a-strlcpy (noflash) + lib_a-strlen (noflash) + lib_a-strlwr (noflash) + lib_a-strncasecmp (noflash) + lib_a-strncat (noflash) + lib_a-strncmp (noflash) + lib_a-strncpy (noflash) + lib_a-strndup (noflash) + lib_a-strnlen (noflash) + lib_a-strrchr (noflash) + lib_a-strsep (noflash) + lib_a-strspn (noflash) + lib_a-strstr (noflash) + lib_a-strtok_r (noflash) + lib_a-strupr (noflash) + lib_a-stdio (noflash) + lib_a-syssbrk (noflash) + lib_a-sysclose (noflash) + lib_a-sysopen (noflash) + creat (noflash) + lib_a-sysread (noflash) + lib_a-syswrite (noflash) + lib_a-impure (noflash) + lib_a-tzvars (noflash) + lib_a-sf_nan (noflash) + lib_a-tzcalc_limits (noflash) + lib_a-month_lengths (noflash) + lib_a-timelocal (noflash) + lib_a-findfp (noflash) + lock (noflash) + lib_a-getenv_r (noflash) + isatty (noflash) + lib_a-fwalk (noflash) + lib_a-getenv_r (noflash) + lib_a-tzlock (noflash) + lib_a-ctype_ (noflash) + lib_a-sccl (noflash) + lib_a-strptime (noflash) + lib_a-envlock (noflash) + lib_a-raise (noflash) + lib_a-strdup_r (noflash) + lib_a-system (noflash) + lib_a-strndup_r (noflash) + else: + * (default) diff --git a/components/soc/linker.lf b/components/soc/linker.lf index f9526f1c6..d68b5a62b 100644 --- a/components/soc/linker.lf +++ b/components/soc/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:soc] archive: libsoc.a entries: cpu_util (noflash_text) diff --git a/components/spi_flash/linker.lf b/components/spi_flash/linker.lf index 35ad334ba..fbbb64ea7 100644 --- a/components/spi_flash/linker.lf +++ b/components/spi_flash/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:spi_flash] archive: libspi_flash.a entries: spi_flash_rom_patch (noflash_text) diff --git a/components/vfs/test/linker.lf b/components/vfs/test/linker.lf index 851ca559b..b2313955b 100644 --- a/components/vfs/test/linker.lf +++ b/components/vfs/test/linker.lf @@ -1,4 +1,4 @@ -[mapping] +[mapping:vfs] archive: libvfs.a entries: vfs:esp_vfs_open (noflash) diff --git a/components/xtensa/linker.lf b/components/xtensa/linker.lf index f79db6296..c39c4ff52 100644 --- a/components/xtensa/linker.lf +++ b/components/xtensa/linker.lf @@ -1,9 +1,9 @@ -[mapping] +[mapping:xtensa] archive: libxtensa.a entries: eri (noflash_text) -[mapping] +[mapping:hal] archive: libhal.a entries: * (noflash_text) diff --git a/tools/ldgen/samples/mappings.lf b/tools/ldgen/samples/mappings.lf index bd029e858..7722cd682 100644 --- a/tools/ldgen/samples/mappings.lf +++ b/tools/ldgen/samples/mappings.lf @@ -1,62 +1,62 @@ -[mapping] +[mapping:heap] archive: libheap.a entries: multi_heap (noflash) multi_heap_poisoning (noflash) -[mapping] +[mapping:soc] archive: libsoc.a entries: * (noflash) -[mapping] +[mapping:freertos] archive: libfreertos.a entries: * (noflash) -[mapping] +[mapping:esp32] archive: libesp32.a entries: core_dump (noflash) panic (noflash) -[mapping] +[mapping:app_trace] archive: libapp_trace.a entries: * (noflash) -[mapping] +[mapping:xtensa_debug_module] archive: libxtensa-debug-module.a entries: eri (noflash) -[mapping] +[mapping:phy] archive: libphy.a entries: * (noflash_data) -[mapping] +[mapping:rtc] archive: librtc.a entries: * (noflash) -[mapping] +[mapping:hal] archive: libhal.a entries: * (noflash) -[mapping] +[mapping:gcc] archive: libgcc.a entries: lib2funcs (noflash) -[mapping] +[mapping:spi_flash] archive: libspi_flash.a entries: spi_flash_rom_patch (noflash) -[mapping] +[mapping:gcov] archive: libgcov.a entries: * (noflash) \ No newline at end of file