Trivial fixes for kconfig. They fix all non-fam10 build failures.

[coreboot.git] / src / mainboard / Kconfig

diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index 2837cb5128ae6e3bc6dcf89978824686414ed24c..54198e13643a392041af5bc3cbd2aa267de57aa7 100644 (file)
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -38,8 +38,6 @@ config VENDOR_DIGITAL_LOGIC
        bool "DIGITAL-LOGIC"
 config VENDOR_EAGLELION
        bool "EagleLion"
-config VENDOR_EMBEDDED_PLANET
-       bool "Embedded Planet"
 config VENDOR_EMULATION
        bool "Emulation"
 config VENDOR_GIGABYTE
@@ -62,8 +60,6 @@ config VENDOR_LIPPERT
        bool "Lippert"
 config VENDOR_MITAC
        bool "Mitac"
-config VENDOR_MOTOROLA
-       bool "Motorola"
 config VENDOR_MSI
        bool "MSI"
 config VENDOR_NEC
@@ -184,11 +180,6 @@ config MAINBOARD_VENDOR
        default "EagleLion"
        depends on VENDOR_EAGLELION
 
-config MAINBOARD_VENDOR
-       string
-       default "Embedded Planet"
-       depends on VENDOR_EMBEDDED_PLANET
-
 config MAINBOARD_VENDOR
        string
        default "Emulation"
@@ -219,6 +210,11 @@ config MAINBOARD_VENDOR
        default "Intel"
        depends on VENDOR_INTEL
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+       hex
+       default 0x8086
+       depends on VENDOR_INTEL
+
 config MAINBOARD_VENDOR
        string
        default "IWILL"
@@ -244,16 +240,16 @@ config MAINBOARD_VENDOR
        default "Mitac"
        depends on VENDOR_MITAC
 
-config MAINBOARD_VENDOR
-       string
-       default "Motorola"
-       depends on VENDOR_MOTOROLA
-
 config MAINBOARD_VENDOR
        string
        default "MSI"
        depends on VENDOR_MSI
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+       hex
+       default 0x1462
+       depends on VENDOR_MSI
+
 config MAINBOARD_VENDOR
        string
        default "NEC"
@@ -356,7 +352,6 @@ source "src/mainboard/compaq/Kconfig"
 source "src/mainboard/dell/Kconfig"
 source "src/mainboard/digitallogic/Kconfig"
 source "src/mainboard/eaglelion/Kconfig"
-source "src/mainboard/embeddedplanet/Kconfig"
 source "src/mainboard/emulation/Kconfig"
 source "src/mainboard/gigabyte/Kconfig"
 source "src/mainboard/hp/Kconfig"
@@ -368,7 +363,6 @@ source "src/mainboard/jetway/Kconfig"
 source "src/mainboard/kontron/Kconfig"
 source "src/mainboard/lippert/Kconfig"
 source "src/mainboard/mitac/Kconfig"
-source "src/mainboard/motorola/Kconfig"
 source "src/mainboard/msi/Kconfig"
 source "src/mainboard/nec/Kconfig"
 source "src/mainboard/newisys/Kconfig"
@@ -386,9 +380,33 @@ source "src/mainboard/thomson/Kconfig"
 source "src/mainboard/tyan/Kconfig"
 source "src/mainboard/via/Kconfig"
 
+config BOARD_ROMSIZE_KB_128
+       bool
+config BOARD_ROMSIZE_KB_256
+       bool
+config BOARD_ROMSIZE_KB_512
+       bool
+config BOARD_ROMSIZE_KB_1024
+       bool
+config BOARD_ROMSIZE_KB_2048
+       bool
+config BOARD_ROMSIZE_KB_4096
+       bool
+
+# TODO: No help text possible for choice fields?
 choice
        prompt "ROM chip size"
-       default COREBOOT_ROMSIZE_KB_256
+       default COREBOOT_ROMSIZE_KB_128 if BOARD_ROMSIZE_KB_128
+       default COREBOOT_ROMSIZE_KB_256 if BOARD_ROMSIZE_KB_256
+       default COREBOOT_ROMSIZE_KB_512 if BOARD_ROMSIZE_KB_512
+       default COREBOOT_ROMSIZE_KB_1024 if BOARD_ROMSIZE_KB_1024
+       default COREBOOT_ROMSIZE_KB_2048 if BOARD_ROMSIZE_KB_2048
+       default COREBOOT_ROMSIZE_KB_4096 if BOARD_ROMSIZE_KB_4096
+       help
+         Select the size of the ROM chip you intend to flash coreboot on.
+
+         The build system will take care of creating a coreboot.rom file
+         of the matching size.
 
 config COREBOOT_ROMSIZE_KB_128
        bool "128 KB"
@@ -422,6 +440,7 @@ config COREBOOT_ROMSIZE_KB_4096
 
 endchoice
 
+# Map the config names to an integer (KB).
 config COREBOOT_ROMSIZE_KB
        int
        default 128 if COREBOOT_ROMSIZE_KB_128
@@ -430,9 +449,8 @@ config COREBOOT_ROMSIZE_KB
        default 1024 if COREBOOT_ROMSIZE_KB_1024
        default 2048 if COREBOOT_ROMSIZE_KB_2048
        default 4096 if COREBOOT_ROMSIZE_KB_4096
-       help
-         Map the config names to an integer.
 
+# Map the config names to a hex value (bytes).
 config ROM_SIZE
        hex
        default 0x20000 if COREBOOT_ROMSIZE_KB_128