Merge branch '2020-05-08-assorted-fixes'

[oweals/u-boot.git] / common / spl / Kconfig

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index b03a476b9f6906d14eae95f39fb9f3eed2f8f7fb..9feadb5e43e7078268086d08af76c0c963422537 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -139,7 +139,7 @@ config SPL_HANDOFF
 
 config SPL_LDSCRIPT
        string "Linker script for the SPL stage"
-       default "arch/$(ARCH)/cpu/u-boot-spl.lds"
+       default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
        help
          The SPL stage will usually require a different linker-script
          (as it runs from a different memory region) than the regular
@@ -508,12 +508,6 @@ config SPL_DMA
          the CPU moving the data. Enable this option to build the drivers
          in drivers/dma as part of an SPL build.
 
-config SPL_DM_GPIO
-       bool "Support Driver Model GPIO drivers"
-       depends on SPL_GPIO_SUPPORT && DM_GPIO
-       help
-         Enable support for Driver Model based GPIO drivers in SPL.
-
 config SPL_DRIVERS_MISC_SUPPORT
        bool "Support misc drivers"
        help
@@ -669,15 +663,6 @@ config SPL_MMC_SUPPORT
          this option to build the drivers in drivers/mmc as part of an SPL
          build.
 
-config SPL_FORCE_MMC_BOOT
-       bool "Force SPL booting from MMC"
-       depends on SPL_MMC_SUPPORT
-       default n
-       help
-         Force SPL to use MMC device for Linux kernel booting even when the
-         SoC ROM recognized boot medium is not eMMC/SD. This is crucial for
-         factory or 'falcon mode' booting.
-
 config SPL_MMC_TINY
        bool "Tiny MMC framework in SPL"
        depends on SPL_MMC_SUPPORT
@@ -1306,7 +1291,7 @@ config TPL_LDSCRIPT
         string "Linker script for the TPL stage"
        depends on TPL
        default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
-       default "arch/$(ARCH)/cpu/u-boot-spl.lds"
+       default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
        help
          The TPL stage will usually require a different linker-script
          (as it runs from a different memory region) than the regular