x86: Update Kconfig options for FSP1

Many of the Kconfig options do not apply to FSP2. Update them to use the
FSP_VERSION1 condition instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 47bf28c434f173a1a9dc9f7ea3875e8b8e9b959f..0de3f6ed7da0e23b004893d434110d324b079c48 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -397,7 +397,7 @@ endchoice
 
 config FSP_FILE
        string "Firmware Support Package binary filename"
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        default "fsp.bin"
        help
          The filename of the file to use as Firmware Support Package binary
@@ -405,7 +405,7 @@ config FSP_FILE
 
 config FSP_ADDR
        hex "Firmware Support Package binary location"
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        default 0xfffc0000
        help
          FSP is not Position Independent Code (PIC) and the whole FSP has to
@@ -418,7 +418,7 @@ config FSP_ADDR
 
 config FSP_TEMP_RAM_ADDR
        hex
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        default 0x2000000
        help
          Stack top address which is used in fsp_init() after DRAM is ready and
@@ -426,14 +426,14 @@ config FSP_TEMP_RAM_ADDR
 
 config FSP_SYS_MALLOC_F_LEN
        hex
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        default 0x100000
        help
          Additional size of malloc() pool before relocation.
 
 config FSP_USE_UPD
        bool
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        default y
        help
          Most FSPs use UPD data region for some FSP customization. But there
@@ -442,7 +442,7 @@ config FSP_USE_UPD
 
 config FSP_BROKEN_HOB
        bool
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        help
          Indicate some buggy FSPs that does not report memory used by FSP
          itself as reserved in the resource descriptor HOB. Select this to
@@ -600,7 +600,7 @@ config VGA_BIOS_ADDR
 
 config HAVE_VBT
        bool "Add a Video BIOS Table (VBT) image"
-       depends on HAVE_FSP
+       depends on FSP_VERSION1
        help
          Select this option if you have a Video BIOS Table (VBT) image that
          you would like to add to your ROM. This is normally required if you