From bd40fc2c90bdb46abfeb9409e56aa1dbab79403d Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Sat, 9 Mar 2019 00:35:40 -0800 Subject: [PATCH] linker: remove references to no longer exist _k_memory_pool Commit 73cb9586ce0645b8d7634d6454a69349e718bc20 renamed linker section from _k_memory_pool to _k_mem_pool, but the references in linker scripts are still there. So remove them now. Signed-off-by: Daniel Leung --- include/linker/common-ram.ld | 12 ------------ scripts/sanitycheck | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/include/linker/common-ram.ld b/include/linker/common-ram.ld index 45631191e13..0e789952389 100644 --- a/include/linker/common-ram.ld +++ b/include/linker/common-ram.ld @@ -63,7 +63,6 @@ SECTION_DATA_PROLOGUE(_k_mem_pool_area, (OPTIONAL), SUBALIGN(4)) { - KEEP(*(SORT_BY_NAME("._k_memory_pool.struct*"))) _k_mem_pool_list_start = .; KEEP(*(SORT_BY_NAME("._k_mem_pool.static.*"))) _k_mem_pool_list_end = .; @@ -137,17 +136,6 @@ _k_event_list_end = .; } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) - SECTION_DATA_PROLOGUE(_k_memory_pool, (OPTIONAL), SUBALIGN(4)) - { - *(._k_memory_pool.struct*) - KEEP(*(SORT_BY_NAME("._k_memory_pool.struct*"))) - - _k_mem_pool_start = .; - *(._k_memory_pool.*) - KEEP(*(SORT_BY_NAME("._k_memory_pool*"))) - _k_mem_pool_end = .; - } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) - SECTION_DATA_PROLOGUE(_net_buf_pool_area, (OPTIONAL), SUBALIGN(4)) { _net_buf_pool_list = .; diff --git a/scripts/sanitycheck b/scripts/sanitycheck index 57d2af49aa8..23250ee7aec 100755 --- a/scripts/sanitycheck +++ b/scripts/sanitycheck @@ -856,7 +856,7 @@ class SizeCalculator: alloc_sections = ["bss", "noinit", "app_bss", "app_noinit", "ccm_bss", "ccm_noinit"] rw_sections = ["datas", "initlevel", "_k_task_list", "_k_event_list", - "_k_memory_pool", "exceptions", "initshell", + "exceptions", "initshell", "_static_thread_area", "_k_timer_area", "_k_mem_slab_area", "_k_mem_pool_area", "sw_isr_table", "_k_sem_area", "_k_mutex_area", "app_shmem_regions",