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>

diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index fcdeb492ba2e0d24570ce4bbfdda6cf8fe43bad5..5cd07c67f5c4f7a73788d428a3365b9fb94c9b6c 100644 (file)
--- 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 b8cdba5a941a2071e409c739b1019e078dd4b63c..1ba662e9f7f556dc231e8b55836d122bb7ddfed4 100644 (file)
--- 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 feecdec4ef005e3d52982f375d4d7c6dcea986ce..df71444da38c813aa63c3b45c9f60c70e01e78ef 100644 (file)
--- 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 70b429d9e6487c1257eec327ead96ff93bcbb907..1ba662e9f7f556dc231e8b55836d122bb7ddfed4 100644 (file)
--- 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 4bad57ddd8bd19a639231cef8bb391ff27fb5787..b2f923d21fb6185a2035c0c6d2aca13510d7c6d0 100644 (file)
--- 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 9e76151ebc5cb46f085b374f3e51c11d6f7e44c3..77fa6ebde082f87afccfb12c0fa949ac42d4aece 100644 (file)
--- 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 ebd7ffd490e3d0b8d7563a0e28f79e65dde1fe9f..d2de8a2da26a8310b451dba775e5dfa76205cc0d 100644 (file)
--- 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 d3097a13ea1675cf58d4088337acee27de433c81..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 3ccc3f97560edb49fda29bfeeb4f5981df1437b2..9e8cf4e601cd4485c3e5d4faea145e550723e107 100644 (file)
--- 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 e8d9af1b7f274e705a2178d92805017624c1e5e6..1ba662e9f7f556dc231e8b55836d122bb7ddfed4 100644 (file)
--- 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 ce49a4781e8cbdff26cb24e90f7e057cde47fcd0..376b81af662fa6f1ccd709bae6013e167c8a1f1d 100644 (file)
--- 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 765096de91306276603c2d0b4314f29d6ead4613..71baa03b1258c7de8acb7c636c009a460d713580 100644 (file)
--- 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 30eacbd955e0a386e7988a4fb94ff0194edfcb42..495602d94b7f8db3e5d45edabb599bd711d825fb 100644 (file)
--- 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 30eacbd955e0a386e7988a4fb94ff0194edfcb42..495602d94b7f8db3e5d45edabb599bd711d825fb 100644 (file)
--- 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 fd5fca883cde422c97209be42b16a57fa72cdc0a..0073ebb255ee3fd4687afb19e102017fb099dc35 100644 (file)
--- 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 1de4a6c49c1e23976fad4a4884fa2319c5a2c96b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 88703f38b6e610bfddc9277d3f43378c8cd9287e..d58f5ab7214eed4ef81a10a998fa11b15b0957d7 100644 (file)
--- 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 c371ad0d2d8dccf815c0986192db1c9865a9d7a6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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