From d5ea49bcbde3908a643e76815459059bdf021a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Tue, 12 Feb 2019 16:13:48 +0100 Subject: [PATCH] ld: Change the name of input section .mmu_data to mmu_tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- arch/x86/CMakeLists.txt | 2 +- include/arch/x86/linker.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/CMakeLists.txt b/arch/x86/CMakeLists.txt index 119d8ee1ea..6cb83e4ef3 100644 --- a/arch/x86/CMakeLists.txt +++ b/arch/x86/CMakeLists.txt @@ -174,7 +174,7 @@ if(CONFIG_X86_MMU) -I binary -B ${OUTPUT_ARCH} -O ${OUTPUT_FORMAT} - --rename-section .data=.mmu_data + --rename-section .data=mmu_tables mmu_tables.bin mmu_tables.o WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/include/arch/x86/linker.ld b/include/arch/x86/linker.ld index 48b09466b6..fefee6b010 100644 --- a/include/arch/x86/linker.ld +++ b/include/arch/x86/linker.ld @@ -378,7 +378,7 @@ SECTIONS MMU_PAGE_ALIGN __mmu_tables_start = .; z_x86_kernel_pdpt = .; - KEEP(*(.mmu_data)); + KEEP(*(mmu_tables)); #ifdef CONFIG_X86_KPTI z_x86_user_pdpt = .; KEEP(*(.user_mmu_data));