Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / Kconfig

diff --git a/src/Kconfig b/src/Kconfig
index 8b07fe39fe85e24c2d06d6005eb8b6e87a446600..67ac5753a7f765ee55e801684879ced9372a198b 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -90,96 +90,6 @@ menu "Chipset"
 comment "CPU"
 source src/cpu/Kconfig
 comment "Northbridge"
-
-menu "HyperTransport setup"
-       depends on (NORTHBRIDGE_AMD_AMDK8 || NORTHBRIDGE_AMD_AMDFAM10) && EXPERT
-
-choice
-       prompt "HyperTransport frequency"
-       default LIMIT_HT_SPEED_AUTO
-       help
-         This option sets the maximum permissible HyperTransport link
-         frequency.
-
-         Use of this option will only limit the autodetected HT frequency.
-         It will not (and cannot) increase the frequency beyond the
-         autodetected limits.
-
-         This is primarily used to work around poorly designed or laid out
-         HT traces on certain motherboards.
-
-config LIMIT_HT_SPEED_200
-       bool "Limit HT frequency to 200MHz"
-config LIMIT_HT_SPEED_400
-       bool "Limit HT frequency to 400MHz"
-config LIMIT_HT_SPEED_600
-       bool "Limit HT frequency to 600MHz"
-config LIMIT_HT_SPEED_800
-       bool "Limit HT frequency to 800MHz"
-config LIMIT_HT_SPEED_1000
-       bool "Limit HT frequency to 1.0GHz"
-config LIMIT_HT_SPEED_1200
-       bool "Limit HT frequency to 1.2GHz"
-config LIMIT_HT_SPEED_1400
-       bool "Limit HT frequency to 1.4GHz"
-config LIMIT_HT_SPEED_1600
-       bool "Limit HT frequency to 1.6GHz"
-config LIMIT_HT_SPEED_1800
-       bool "Limit HT frequency to 1.8GHz"
-config LIMIT_HT_SPEED_2000
-       bool "Limit HT frequency to 2.0GHz"
-config LIMIT_HT_SPEED_2200
-       bool "Limit HT frequency to 2.2GHz"
-config LIMIT_HT_SPEED_2400
-       bool "Limit HT frequency to 2.4GHz"
-config LIMIT_HT_SPEED_2600
-       bool "Limit HT frequency to 2.6GHz"
-config LIMIT_HT_SPEED_AUTO
-       bool "Autodetect HT frequency"
-endchoice
-
-choice
-       prompt "HyperTransport downlink width"
-       default LIMIT_HT_DOWN_WIDTH_16
-       help
-         This option sets the maximum permissible HyperTransport
-         downlink width.
-
-         Use of this option will only limit the autodetected HT width.
-         It will not (and cannot) increase the width beyond the autodetected
-         limits.
-
-         This is primarily used to work around poorly designed or laid out HT
-         traces on certain motherboards.
-
-config LIMIT_HT_DOWN_WIDTH_8
-       bool "8 bits"
-config LIMIT_HT_DOWN_WIDTH_16
-       bool "16 bits"
-endchoice
-
-choice
-       prompt "HyperTransport uplink width"
-       default LIMIT_HT_UP_WIDTH_16
-       help
-         This option sets the maximum permissible HyperTransport
-         uplink width.
-
-         Use of this option will only limit the autodetected HT width.
-         It will not (and cannot) increase the width beyond the autodetected
-         limits.
-
-         This is primarily used to work around poorly designed or laid out HT
-         traces on certain motherboards.
-
-config LIMIT_HT_UP_WIDTH_8
-       bool "8 bits"
-config LIMIT_HT_UP_WIDTH_16
-       bool "16 bits"
-endchoice
-
-endmenu
-
 source src/northbridge/Kconfig
 comment "Southbridge"
 source src/southbridge/Kconfig
@@ -206,14 +116,6 @@ config CPU_ADDR_BITS
        int
        default 36
 
-config XIP_ROM_BASE
-       hex
-       default 0xfffe0000
-
-config XIP_ROM_SIZE
-       hex
-       default 0x20000
-
 config LOGICAL_CPUS
        bool
        default y
@@ -235,7 +137,7 @@ config USE_PRINTK_IN_CAR
        default n
 
 config USE_OPTION_TABLE
-       bool
+       bool "Use CMOS for configuration values"
        default n
 
 config MAX_CPUS
@@ -250,10 +152,6 @@ config MMCONF_SUPPORT
        bool
        default n
 
-config RAMTOP
-       hex
-       default 0x200000
-
 config ATI_RAGE_XL
        bool
 
@@ -556,8 +454,8 @@ config FALLBACK_BOOTSPLASH_FILE
        depends on BOOTSPLASH
        default "bootsplash.jpg"
        help
-         The path and filename of the file to use as graphical bootsplash 
-         screen. The file format has to be jpg. 
+         The path and filename of the file to use as graphical bootsplash
+         screen. The file format has to be jpg.
 
 # TODO: Turn this into a "choice".
 config FRAMEBUFFER_VESA_MODE
@@ -622,7 +520,8 @@ config DEBUG_SMBUS
                 || NORTHBRIDGE_VIA_VX800 \
                 || NORTHBRIDGE_VIA_CX700 \
                 || NORTHBRIDGE_AMD_AMDK8 \
-                || NORTHBRIDGE_AMD_AMDFAM10)
+                || NORTHBRIDGE_AMD_AMDFAM10 \
+                || SOUTHBRIDGE_VIA_VT8231)
        help
          This option enables additional SMBus (and SPD) debug messages.
 
@@ -669,7 +568,7 @@ config X86EMU_DEBUG_TRACE
        depends on X86EMU_DEBUG
        help
          Print _all_ opcodes that are executed by x86emu.
-         
+
          WARNING: This will produce a LOT of output and take a long time.
 
          Note: This option will increase the size of the coreboot image.