Merge tag 'soc-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a0da424fc93aac9bc4ad732f3a0dcd04a1155d5a..43c7773b89ae7972d82eb3ab15937bb787d715ed 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -345,12 +345,14 @@ comment "CPU Core family selection"
 config ARCH_MULTI_V4
        bool "ARMv4 based platforms (FA526, StrongARM)"
        depends on !ARCH_MULTI_V6_V7
+       depends on !LD_IS_LLD
        select ARCH_MULTI_V4_V5
        select CPU_FA526 if !(CPU_SA110 || CPU_SA1100)
 
 config ARCH_MULTI_V4T
        bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
        depends on !ARCH_MULTI_V6_V7
+       depends on !LD_IS_LLD
        select ARCH_MULTI_V4_V5
        select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \
                CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \