From c206b443eddf9d4775962f0d0037fd2d157650b3 Mon Sep 17 00:00:00 2001 From: Aiken Harris Date: Thu, 16 Oct 2025 12:22:30 +0200 Subject: [PATCH] Move XTLDR image base definition to arch-specific config --- boot/xtldr/CMakeLists.txt | 2 +- sdk/cmake/baseaddress/amd64.cmake | 1 + sdk/cmake/baseaddress/i686.cmake | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/xtldr/CMakeLists.txt b/boot/xtldr/CMakeLists.txt index 8a64cc3..68bd3b1 100644 --- a/boot/xtldr/CMakeLists.txt +++ b/boot/xtldr/CMakeLists.txt @@ -53,6 +53,6 @@ set_install_target(xtldr efi/boot) # Set loader entrypoint and subsystem set_entrypoint(xtldr "BlStartXtLoader") -set_imagebase(xtldr 0xF800) +set_imagebase(xtldr ${BASEADDRESS_XTLDR}) set_linker_map(xtldr TRUE) set_subsystem(xtldr efi_application) diff --git a/sdk/cmake/baseaddress/amd64.cmake b/sdk/cmake/baseaddress/amd64.cmake index 162a92e..df43ef8 100644 --- a/sdk/cmake/baseaddress/amd64.cmake +++ b/sdk/cmake/baseaddress/amd64.cmake @@ -1,2 +1,3 @@ # Set base addresses for all modules +set(BASEADDRESS_XTLDR 0x000000000000F800) set(BASEADDRESS_XTOSKRNL 0x0000000140000000) diff --git a/sdk/cmake/baseaddress/i686.cmake b/sdk/cmake/baseaddress/i686.cmake index 265fa5e..4a1140b 100644 --- a/sdk/cmake/baseaddress/i686.cmake +++ b/sdk/cmake/baseaddress/i686.cmake @@ -1,2 +1,3 @@ # Set base addresses for all modules +set(BASEADDRESS_XTLDR 0x0000F800) set(BASEADDRESS_XTOSKRNL 0x00400000)