summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2012-02-07 14:59:07 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-02-07 19:42:42 +0100
commit7f782a8f0b0691df506c1f0a8cb2d435582bbe68 (patch)
treec352f7fcc4373462324ca2535d034f0cbd912ae4
parent7627f7f22d06accc9a22b3859cd1813d6f3c99c5 (diff)
Delete hard-coded driver includes
Driver components are conditionally included in the build using the Kconfig options. Change-Id: I05417ee263a5b82e947600482dfb68f7a3f52d58 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/610 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Kconfig5
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Makefile.inc1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Kconfig1
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc1
-rw-r--r--src/mainboard/broadcom/blast/Kconfig1
-rw-r--r--src/mainboard/broadcom/blast/Makefile.inc1
-rw-r--r--src/mainboard/hp/dl145_g1/Kconfig1
-rw-r--r--src/mainboard/hp/dl145_g1/Makefile.inc1
-rw-r--r--src/mainboard/msi/ms9282/Kconfig2
-rw-r--r--src/mainboard/msi/ms9282/Makefile.inc4
-rw-r--r--src/mainboard/supermicro/h8dme/Kconfig1
-rw-r--r--src/mainboard/supermicro/h8dme/Makefile.inc2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Makefile.inc1
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Makefile.inc1
-rw-r--r--src/mainboard/tyan/s2881/Kconfig1
-rw-r--r--src/mainboard/tyan/s2881/Makefile.inc1
-rw-r--r--src/mainboard/tyan/s2892/Kconfig1
-rw-r--r--src/mainboard/tyan/s2892/Makefile.inc2
18 files changed, 11 insertions, 17 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index fcdeb492ba..5cd07c67f5 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -3,8 +3,8 @@ if BOARD_AMD_SERENGETI_CHEETAH
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select ARCH_X86
- select SOUTHBRIDGE_AMD_AMD8132
- select SOUTHBRIDGE_AMD_AMD8151
+ select SOUTHBRIDGE_AMD_AMD8132
+ select SOUTHBRIDGE_AMD_AMD8151
select CPU_AMD_SOCKET_F
select DIMM_DDR2
select DIMM_REGISTERED
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_I2CMUX
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
index b8cdba5a94..1ba662e9f7 100644
--- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc
@@ -17,4 +17,3 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index feecdec4ef..df71444da3 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -25,6 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select ENABLE_APIC_EXT_ID
select LIFT_BSP_APIC_ID
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_I2CMUX2
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
index 70b429d9e6..1ba662e9f7 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
@@ -17,4 +17,3 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c
diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig
index 4bad57ddd8..b2f923d21f 100644
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_512
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_I2CMUX2
config MAINBOARD_DIR
string
diff --git a/src/mainboard/broadcom/blast/Makefile.inc b/src/mainboard/broadcom/blast/Makefile.inc
index 9e76151ebc..77fa6ebde0 100644
--- a/src/mainboard/broadcom/blast/Makefile.inc
+++ b/src/mainboard/broadcom/blast/Makefile.inc
@@ -1,4 +1,3 @@
# Needed by irq_tables and mptable and acpi_tables.
-ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c
diff --git a/src/mainboard/hp/dl145_g1/Kconfig b/src/mainboard/hp/dl145_g1/Kconfig
index ebd7ffd490..d2de8a2da2 100644
--- a/src/mainboard/hp/dl145_g1/Kconfig
+++ b/src/mainboard/hp/dl145_g1/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select RAMINIT_SYSINFO
# select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_I2CMUX
config MAINBOARD_DIR
string
diff --git a/src/mainboard/hp/dl145_g1/Makefile.inc b/src/mainboard/hp/dl145_g1/Makefile.inc
index d3097a13ea..e69de29bb2 100644
--- a/src/mainboard/hp/dl145_g1/Makefile.inc
+++ b/src/mainboard/hp/dl145_g1/Makefile.inc
@@ -1 +0,0 @@
-ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c \ No newline at end of file
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index 3ccc3f9756..9e8cf4e601 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -19,6 +19,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_ADM1027
+ select DRIVERS_I2C_I2CMUX2
config MAINBOARD_DIR
string
diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc
index e8d9af1b7f..1ba662e9f7 100644
--- a/src/mainboard/msi/ms9282/Makefile.inc
+++ b/src/mainboard/msi/ms9282/Makefile.inc
@@ -17,7 +17,3 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-# FIXME drivers should be selected through Kconfig
-ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c
-ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c
-
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index ce49a4781e..376b81af66 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select QRANK_DIMM_SUPPORT
select K8_ALLOCATE_IO_RANGE
select SET_FIDVID
+ select DRIVERS_I2C_I2CMUX2
config MAINBOARD_DIR
string
diff --git a/src/mainboard/supermicro/h8dme/Makefile.inc b/src/mainboard/supermicro/h8dme/Makefile.inc
index 765096de91..71baa03b12 100644
--- a/src/mainboard/supermicro/h8dme/Makefile.inc
+++ b/src/mainboard/supermicro/h8dme/Makefile.inc
@@ -17,6 +17,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c
-
# Needed by irq_tables and mptable and acpi_tables.
diff --git a/src/mainboard/supermicro/x6dhe_g/Makefile.inc b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
index 30eacbd955..495602d94b 100644
--- a/src/mainboard/supermicro/x6dhe_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
@@ -19,4 +19,3 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-ramstage-y += ../../../drivers/generic/debug/debug_dev.c
diff --git a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
index 30eacbd955..495602d94b 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
@@ -19,4 +19,3 @@
##
ROMCCFLAGS=-mcpu=p4 -O2
-ramstage-y += ../../../drivers/generic/debug/debug_dev.c
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index fd5fca883c..0073ebb255 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select DRIVERS_SIL_3114
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_ADT7463
config MAINBOARD_DIR
string
diff --git a/src/mainboard/tyan/s2881/Makefile.inc b/src/mainboard/tyan/s2881/Makefile.inc
index 1de4a6c49c..e69de29bb2 100644
--- a/src/mainboard/tyan/s2881/Makefile.inc
+++ b/src/mainboard/tyan/s2881/Makefile.inc
@@ -1 +0,0 @@
-ramstage-y += ../../../drivers/i2c/adt7463/adt7463.c
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 88703f38b6..d58f5ab721 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select QRANK_DIMM_SUPPORT
+ select DRIVERS_I2C_ADM1027
config MAINBOARD_DIR
string
diff --git a/src/mainboard/tyan/s2892/Makefile.inc b/src/mainboard/tyan/s2892/Makefile.inc
index c371ad0d2d..e69de29bb2 100644
--- a/src/mainboard/tyan/s2892/Makefile.inc
+++ b/src/mainboard/tyan/s2892/Makefile.inc
@@ -1,2 +0,0 @@
-
-ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c