fpga: virtex2: cosmetic: Cleanup code style

[platform/kernel/u-boot.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 31e7500..d2eb744 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -20,6 +20,13 @@ config BROKEN
          This option cannot be enabled. It is used as dependency
          for broken and incomplete features.
 
          This option cannot be enabled. It is used as dependency
          for broken and incomplete features.
 

+config DEPRECATED
+       bool
+       help
+         This option cannot be enabled.  It it used as a dependency for
+         code that relies on deprecated features that will be removed and
+         the conversion deadline has passed.
+

 config LOCALVERSION
        string "Local version - append to U-Boot release"
        help
 config LOCALVERSION
        string "Local version - append to U-Boot release"
        help


@@ -243,7 +250,7 @@ config BUILD_TARGET
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
        default "u-boot-elf.srec" if RCAR_GEN3
        default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5
        default "u-boot-spl.kwb" if ARCH_MVEBU && SPL
        default "u-boot-elf.srec" if RCAR_GEN3

-       default "u-boot.itb" if SPL_LOAD_FIT && ARCH_SUNXI
+       default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || ARCH_SUNXI)

        default "u-boot.kwb" if KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        help
        default "u-boot.kwb" if KIRKWOOD
        default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
        help


@@ -337,7 +344,7 @@ config FIT_SIGNATURE
          check the legacy image format is disabled by default, so that
          unsigned images cannot be loaded. If a board needs the legacy image
          format support in this case, enable it using
          check the legacy image format is disabled by default, so that
          unsigned images cannot be loaded. If a board needs the legacy image
          format support in this case, enable it using

-         CONFIG_IMAGE_FORMAT_LEGACY.
+         CONFIG_LEGACY_IMAGE_FORMAT.

 
 config FIT_SIGNATURE_MAX_SIZE
        hex "Max size of signed FIT structures"
 
 config FIT_SIGNATURE_MAX_SIZE
        hex "Max size of signed FIT structures"


@@ -466,7 +473,7 @@ endif # SPL
 
 endif # FIT
 
 
 endif # FIT
 

-config IMAGE_FORMAT_LEGACY
+config LEGACY_IMAGE_FORMAT

        bool "Enable support for the legacy image format"
        default y if !FIT_SIGNATURE
        help
        bool "Enable support for the legacy image format"
        default y if !FIT_SIGNATURE
        help