[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] xen/arm: Kconfig: ACPI should depend on UEFI



commit dc5e6082f5b36c4a4008c158b53320699025f895
Author:     Julien Grall <jgrall@xxxxxxxxxx>
AuthorDate: Wed Jul 5 14:47:16 2023 +0100
Commit:     Julien Grall <jgrall@xxxxxxxxxx>
CommitDate: Wed Jul 5 14:47:35 2023 +0100

    xen/arm: Kconfig: ACPI should depend on UEFI
    
    On Arm, it is not possible to use ACPI without UEFI. In fact disabling
    UEFI but not ACPI will lead to a compilation error:
    
    ld: prelink.o: in function `acpi_os_get_root_pointer':
    /builds/xen-project/people/andyhhp/xen/xen/drivers/acpi/osl.c:73:
    undefined reference to `efi'
    
/builds/xen-project/people/andyhhp/xen/xen/drivers/acpi/osl.c:73:(.init.text+0x8ac0):
    relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against
    undefined symbol `efi'
    
    So make the dependency clear in the Kconfig.
    
    This was spotted by the randconfig build in gitlab CI.
    
    Fixes: 12314be5749e ("xen/arm: make ARM_EFI selectable for Arm64")
    Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
 xen/arch/arm/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index c30f324573..439cc94f33 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -63,11 +63,11 @@ source "arch/Kconfig"
 
 config ACPI
        bool "ACPI (Advanced Configuration and Power Interface) Support 
(UNSUPPORTED)" if UNSUPPORTED
-       depends on ARM_64
+       depends on ARM_64 && ARM_EFI
        ---help---
 
          Advanced Configuration and Power Interface (ACPI) support for Xen is
-         an alternative to device tree on ARM64.
+         an alternative to device tree on ARM64. This requires UEFI.
 
 config ARM_EFI
        bool "UEFI boot service support"
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.