patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

ld: Change the name of input section .mmu_data to mmu_tables

Browse source 
The arch/x86/CMakeLists.txt build scripts names five sections that are
generated from .bin files. Two of them are named the same as the .bin
file, and the other three are named inconsistently.

To be consistent, we will rename the three that are named inconistenly
to align with the two that are named as the .bin file.

Being consistent simplifies the system and fosters code-reuse.

This patch renames mmu_tables.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2019-02-12 16:13:48 +01:00 committed by Andrew Boie
parent 63df409906
commit d5ea49bcbd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/CMakeLists.txt
View file

@ -174,7 +174,7 @@ if(CONFIG_X86_MMU)
-I binary -I binary
-B ${OUTPUT_ARCH} -B ${OUTPUT_ARCH}
-O ${OUTPUT_FORMAT} -O ${OUTPUT_FORMAT}
--rename-section .data=.mmu_data --rename-section .data=mmu_tables
mmu_tables.bin mmu_tables.bin
mmu_tables.o mmu_tables.o
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

2
include/arch/x86/linker.ld
View file

@ -378,7 +378,7 @@ SECTIONS
MMU_PAGE_ALIGN MMU_PAGE_ALIGN
__mmu_tables_start = .; __mmu_tables_start = .;
z_x86_kernel_pdpt = .; z_x86_kernel_pdpt = .;
KEEP(*(.mmu_data)); KEEP(*(mmu_tables));
#ifdef CONFIG_X86_KPTI #ifdef CONFIG_X86_KPTI
z_x86_user_pdpt = .; z_x86_user_pdpt = .;
KEEP(*(.user_mmu_data)); KEEP(*(.user_mmu_data));