From 7f782a8f0b0691df506c1f0a8cb2d435582bbe68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 7 Feb 2012 14:59:07 +0200 Subject: [PATCH 1/1] Delete hard-coded driver includes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Driver components are conditionally included in the build using the Kconfig options. Change-Id: I05417ee263a5b82e947600482dfb68f7a3f52d58 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/610 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/amd/serengeti_cheetah/Kconfig | 5 +++-- src/mainboard/amd/serengeti_cheetah/Makefile.inc | 1 - src/mainboard/amd/serengeti_cheetah_fam10/Kconfig | 1 + src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc | 1 - src/mainboard/broadcom/blast/Kconfig | 1 + src/mainboard/broadcom/blast/Makefile.inc | 1 - src/mainboard/hp/dl145_g1/Kconfig | 1 + src/mainboard/hp/dl145_g1/Makefile.inc | 1 - src/mainboard/msi/ms9282/Kconfig | 2 ++ src/mainboard/msi/ms9282/Makefile.inc | 4 ---- src/mainboard/supermicro/h8dme/Kconfig | 1 + src/mainboard/supermicro/h8dme/Makefile.inc | 2 -- src/mainboard/supermicro/x6dhe_g/Makefile.inc | 1 - src/mainboard/supermicro/x6dhe_g2/Makefile.inc | 1 - src/mainboard/tyan/s2881/Kconfig | 1 + src/mainboard/tyan/s2881/Makefile.inc | 1 - src/mainboard/tyan/s2892/Kconfig | 1 + src/mainboard/tyan/s2892/Makefile.inc | 2 -- 18 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index fcdeb492b..5cd07c67f 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 b8cdba5a9..1ba662e9f 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 feecdec4e..df71444da 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 70b429d9e..1ba662e9f 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 4bad57ddd..b2f923d21 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 9e76151eb..77fa6ebde 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 ebd7ffd49..d2de8a2da 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 d3097a13e..e69de29bb 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 3ccc3f975..9e8cf4e60 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 e8d9af1b7..1ba662e9f 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 ce49a4781..376b81af6 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 765096de9..71baa03b1 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 30eacbd95..495602d94 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 30eacbd95..495602d94 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 fd5fca883..0073ebb25 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 1de4a6c49..e69de29bb 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 88703f38b..d58f5ab72 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 c371ad0d2..e69de29bb 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 -- 2.25.1