Author: myles Date: 2009-02-25 18:50:38 +0100 (Wed, 25 Feb 2009) New Revision: 1140
Modified: coreboot-v3/Kconfig coreboot-v3/device/Kconfig coreboot-v3/device/Makefile coreboot-v3/device/hypertransport.c coreboot-v3/device/pci_device.c Log: This patch removes all *_PLUGIN_SUPPORT options and replaces most *_SUPPORT options with NO_*_SUPPORT options. This means that you have to specify that you want a smaller BIOS, otherwise you get full functionality.
HyperTransport is the only exception for a couple of reasons. HT requires a mainboard.h file which not all mainboards have, and it's less likely to be "plugged in" to a board that doesn't have some onboard HT.
It also fixes a trivial typo in Kconfig (paylaod -> payload)
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Peter Stuge peter@stuge.se
Modified: coreboot-v3/Kconfig =================================================================== --- coreboot-v3/Kconfig 2009-02-24 03:38:37 UTC (rev 1139) +++ coreboot-v3/Kconfig 2009-02-25 17:50:38 UTC (rev 1140) @@ -94,15 +94,15 @@ # These are used for internal purposes only:
# Buses: -config PCIX_SUPPORT +config NO_PCIX_SUPPORT boolean -config PCIE_SUPPORT +config NO_PCIE_SUPPORT boolean config HYPERTRANSPORT_SUPPORT boolean -config AGP_SUPPORT +config NO_AGP_SUPPORT boolean -config CARDBUS_SUPPORT +config NO_CARDBUS_SUPPORT boolean
# Northbridges: @@ -124,19 +124,14 @@ config SOUTHBRIDGE_INTEL_I82371EB boolean config SOUTHBRIDGE_NVIDIA_CK804 - select PCIE_SUPPORT boolean config SOUTHBRIDGE_NVIDIA_MCP55 - select PCIE_SUPPORT boolean config SOUTHBRIDGE_AMD_AMD8151 - select AGP_SUPPORT boolean config SOUTHBRIDGE_AMD_AMD8132 - select PCIX_SUPPORT boolean config SOUTHBRIDGE_AMD_AMD8131 - select PCIX_SUPPORT boolean config SOUTHBRIDGE_AMD_AMD8111 boolean @@ -174,7 +169,7 @@ bool "Include ELF payload loader" default n help - This option allows an unparsed ELF paylaod to be added and loaded. + This option allows an unparsed ELF payload to be added and loaded.
choice prompt "Payload type"
Modified: coreboot-v3/device/Kconfig =================================================================== --- coreboot-v3/device/Kconfig 2009-02-24 03:38:37 UTC (rev 1139) +++ coreboot-v3/device/Kconfig 2009-02-25 17:50:38 UTC (rev 1140) @@ -123,44 +123,33 @@ Initialize onboard VGA chips before any plugin VGA cards are initialized.
-menu "Plugin Support" +menu "Remove Bus Support (for size reasons)" depends EXPERT
-config PCIX_PLUGIN_SUPPORT - bool "Support for devices that provide PCI-X and aren't in the dts." - select PCIX_SUPPORT +config NO_PCIX_SUPPORT + bool "Remove support for PCI-X." default false help - Compile in the drivers for cards that provide PCI-X. + Don't compile in the drivers for cards that provide PCI-X.
-config PCIE_PLUGIN_SUPPORT - bool "Support for devices that provide PCI-e and aren't in the dts." - select PCIE_SUPPORT +config NO_PCIE_SUPPORT + bool "Remove support for PCI-Express." default false help - Compile in the drivers for cards that provide PCI-e. + Don't compile in the drivers for cards that provide PCI-e.
-config HYPERTRANSPORT_PLUGIN_SUPPORT - bool "Support for devices that provide HT and aren't in the dts." - select HYPERTRANSPORT_SUPPORT +config NO_AGP_SUPPORT + bool "Remove support for AGP." default false help - Compile in the drivers for cards that provide HT. + Don't compile in the drivers for cards that provide AGP.
-config AGP_PLUGIN_SUPPORT - bool "Support for devices that provide AGP and aren't in the dts." - select AGP_SUPPORT +config NO_CARDBUS_SUPPORT + bool "Remove support for CardBus." default false help - Compile in the drivers for cards that provide AGP. + Don't compile in the drivers for cards that provide CardBus.
-config CARDBUS_PLUGIN_SUPPORT - bool "Support for devices that provide Cardbus and aren't in the dts." - select CARDBUS_SUPPORT - default false - help - Compile in the drivers for cards that provide Cardbus. - endmenu
endmenu #Devices
Modified: coreboot-v3/device/Makefile =================================================================== --- coreboot-v3/device/Makefile 2009-02-24 03:38:37 UTC (rev 1139) +++ coreboot-v3/device/Makefile 2009-02-25 17:50:38 UTC (rev 1140) @@ -32,19 +32,19 @@ STAGE2_DEVICE_SRC += hypertransport.c endif
-ifeq ($(CONFIG_PCIX_SUPPORT),y) +ifneq ($(CONFIG_NO_PCIX_SUPPORT),y) STAGE2_DEVICE_SRC += pcix_device.c endif
-ifeq ($(CONFIG_PCIE_SUPPORT),y) +ifneq ($(CONFIG_NO_PCIE_SUPPORT),y) STAGE2_DEVICE_SRC += pcie_device.c endif
-ifeq ($(CONFIG_CARDBUS_SUPPORT),y) +ifneq ($(CONFIG_NO_CARDBUS_SUPPORT),y) STAGE2_DEVICE_SRC += cardbus_device.c endif
-ifeq ($(CONFIG_AGP_SUPPORT),y) +ifneq ($(CONFIG_NO_AGP_SUPPORT),y) STAGE2_DEVICE_SRC += agp_device.c endif
Modified: coreboot-v3/device/hypertransport.c =================================================================== --- coreboot-v3/device/hypertransport.c 2009-02-24 03:38:37 UTC (rev 1139) +++ coreboot-v3/device/hypertransport.c 2009-02-25 17:50:38 UTC (rev 1140) @@ -41,6 +41,15 @@ #include <lib.h> #include <lapic.h>
+/* These defines are for PLUGIN_SUPPORT. */ +#ifndef HT_CHAIN_UNITID_BASE +#define HT_CHAIN_UNITID_BASE 0 +#endif + +#ifndef HT_CHAIN_END_UNITID_BASE +#define HT_CHAIN_END_UNITID_BASE 0 +#endif + #define OPT_HT_LINK 0
static struct device *ht_scan_get_devs(struct device **old_devices)
Modified: coreboot-v3/device/pci_device.c =================================================================== --- coreboot-v3/device/pci_device.c 2009-02-24 03:38:37 UTC (rev 1139) +++ coreboot-v3/device/pci_device.c 2009-02-25 17:50:38 UTC (rev 1140) @@ -32,19 +32,19 @@ #include <device/pci.h> #include <device/pci_ids.h>
-#ifdef CONFIG_PCIX_PLUGIN_SUPPORT +#ifndef CONFIG_NO_PCIX_SUPPORT #include <device/pcix.h> #endif -#ifdef CONFIG_AGP_PLUGIN_SUPPORT +#ifndef CONFIG_NO_AGP_SUPPORT #include <device/agp.h> #endif -#ifdef CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT +#ifdef CONFIG_HYPERTRANSPORT_SUPPORT #include <device/hypertransport.h> #endif -#ifdef CONFIG_PCIE_PLUGIN_SUPPORT +#ifndef CONFIG_NO_PCIE_SUPPORT #include <device/pcie.h> #endif -#ifdef CONFIG_CARDBUS_PLUGIN_SUPPORT +#ifndef CONFIG_NO_CARDBUS_SUPPORT #include <device/cardbus.h> #endif
@@ -792,7 +792,7 @@ */ static const struct device_operations *get_pci_bridge_ops(struct device *dev) { -#ifdef CONFIG_PCIX_PLUGIN_SUPPORT +#ifndef CONFIG_NO_PCIX_SUPPORT unsigned int pcix_pos; pcix_pos = pci_find_capability(dev, PCI_CAP_ID_PCIX); if (pcix_pos) { @@ -801,12 +801,12 @@ return &default_pcix_ops_bus; } #endif -#ifdef CONFIG_AGP_PLUGIN_SUPPORT +#ifndef CONFIG_NO_AGP_SUPPORT /* How do I detect an PCI to AGP bridge? */ #warning AGP detection not implemented, so AGP bridge plugin not supported.
#endif -#ifdef CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT +#ifdef CONFIG_HYPERTRANSPORT_SUPPORT unsigned int ht_pos; ht_pos = 0; while ((ht_pos = pci_find_next_capability(dev, PCI_CAP_ID_HT, ht_pos))) { @@ -821,7 +821,7 @@ } } #endif -#ifdef CONFIG_PCIE_PLUGIN_SUPPORT +#ifndef CONFIG_NO_PCIE_SUPPORT unsigned int pcie_pos; pcie_pos = pci_find_capability(dev, PCI_CAP_ID_PCIE); if (pcie_pos) { @@ -897,7 +897,7 @@ else dev->ops = get_pci_bridge_ops(dev); break; -#ifdef CONFIG_CARDBUS_PLUGIN_SUPPORT +#ifndef CONFIG_NO_CARDBUS_SUPPORT case PCI_HEADER_TYPE_CARDBUS: dev->ops = &default_cardbus_ops_bus; break;