From cc295dd73a20f340cfab7e82a0a1d2a0a3b37edf Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Wed, 25 Feb 2009 17:50:38 +0000 Subject: 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 Acked-by: Peter Stuge git-svn-id: svn://coreboot.org/repository/coreboot-v3@1140 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- Kconfig | 15 +++++---------- device/Kconfig | 37 +++++++++++++------------------------ device/Makefile | 8 ++++---- device/hypertransport.c | 9 +++++++++ device/pci_device.c | 20 ++++++++++---------- 5 files changed, 41 insertions(+), 48 deletions(-) diff --git a/Kconfig b/Kconfig index 8adc0451e6ae..48cf13da871f 100644 --- a/Kconfig +++ b/Kconfig @@ -94,15 +94,15 @@ source device/Kconfig # 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_AMD_CS5536 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 @@ config PAYLOAD_ELF_LOADER 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" diff --git a/device/Kconfig b/device/Kconfig index 06c154e7145e..9f944a415413 100644 --- a/device/Kconfig +++ b/device/Kconfig @@ -123,43 +123,32 @@ config INITIALIZE_ONBOARD_VGA_FIRST 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. - -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. + Don't compile in the drivers for cards that provide CardBus. endmenu diff --git a/device/Makefile b/device/Makefile index 727ad36af67f..ff4f4f745e57 100644 --- a/device/Makefile +++ b/device/Makefile @@ -32,19 +32,19 @@ ifeq ($(CONFIG_HYPERTRANSPORT_SUPPORT),y) 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 diff --git a/device/hypertransport.c b/device/hypertransport.c index 690bab39f3bc..eb2ce51162cd 100644 --- a/device/hypertransport.c +++ b/device/hypertransport.c @@ -41,6 +41,15 @@ #include #include +/* 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) diff --git a/device/pci_device.c b/device/pci_device.c index 01f8972912ba..c76092dfddb2 100644 --- a/device/pci_device.c +++ b/device/pci_device.c @@ -32,19 +32,19 @@ #include #include -#ifdef CONFIG_PCIX_PLUGIN_SUPPORT +#ifndef CONFIG_NO_PCIX_SUPPORT #include #endif -#ifdef CONFIG_AGP_PLUGIN_SUPPORT +#ifndef CONFIG_NO_AGP_SUPPORT #include #endif -#ifdef CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT +#ifdef CONFIG_HYPERTRANSPORT_SUPPORT #include #endif -#ifdef CONFIG_PCIE_PLUGIN_SUPPORT +#ifndef CONFIG_NO_PCIE_SUPPORT #include #endif -#ifdef CONFIG_CARDBUS_PLUGIN_SUPPORT +#ifndef CONFIG_NO_CARDBUS_SUPPORT #include #endif @@ -792,7 +792,7 @@ const struct device_operations default_pci_ops_bus = { */ 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 @@ static const struct device_operations *get_pci_bridge_ops(struct device *dev) 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 @@ static const struct device_operations *get_pci_bridge_ops(struct device *dev) } } #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 @@ static void set_pci_ops(struct device *dev) 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; -- cgit v1.2.3