From b0161fd2d8679882a50d1f3ce55cdf69278aa32f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 3 Apr 2017 15:35:09 +0200 Subject: southbridge/via/vt8237r: Get rid of #include early_smbus.c Use linker instead of '#include *.c'. The smbus_fixup() was changed not to use a structure that's defined by a northbridge since multiple different northbridges can be used. Instead the caller now directly passed the memory slot details. Change-Id: Ia369ece6365accbc531736fc463c713bbc134807 Signed-off-by: Lubomir Rintel Reviewed-on: https://review.coreboot.org/19082 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Paul Menzel --- src/mainboard/asus/a8v-e_deluxe/romstage.c | 2 +- src/mainboard/asus/a8v-e_se/romstage.c | 2 +- src/mainboard/asus/k8v-x/romstage.c | 2 +- src/mainboard/asus/m2v-mx_se/romstage.c | 2 +- src/mainboard/asus/m2v/romstage.c | 2 +- src/mainboard/bcom/winnetp680/romstage.c | 4 ++-- src/mainboard/jetway/j7f2/romstage.c | 4 ++-- src/mainboard/via/epia-cn/romstage.c | 4 ++-- src/mainboard/via/epia-m700/romstage.c | 2 +- src/mainboard/via/pc2500e/romstage.c | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/asus/a8v-e_deluxe/romstage.c b/src/mainboard/asus/a8v-e_deluxe/romstage.c index 4f942b5cc9..c6ea08da26 100644 --- a/src/mainboard/asus/a8v-e_deluxe/romstage.c +++ b/src/mainboard/asus/a8v-e_deluxe/romstage.c @@ -37,7 +37,7 @@ unsigned int get_sbdn(unsigned bus); #include "northbridge/amd/amdk8/early_ht.c" #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ #include #include "northbridge/amd/amdk8/setup_resource_map.c" diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c index 2530aee96e..f2465d03c8 100644 --- a/src/mainboard/asus/a8v-e_se/romstage.c +++ b/src/mainboard/asus/a8v-e_se/romstage.c @@ -37,7 +37,7 @@ unsigned int get_sbdn(unsigned bus); #include "northbridge/amd/amdk8/early_ht.c" #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ #include #include "northbridge/amd/amdk8/setup_resource_map.c" diff --git a/src/mainboard/asus/k8v-x/romstage.c b/src/mainboard/asus/k8v-x/romstage.c index 2f7c3df310..a0565a9ce7 100644 --- a/src/mainboard/asus/k8v-x/romstage.c +++ b/src/mainboard/asus/k8v-x/romstage.c @@ -37,7 +37,7 @@ unsigned int get_sbdn(unsigned bus); #include "northbridge/amd/amdk8/early_ht.c" #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ #include #include "northbridge/amd/amdk8/setup_resource_map.c" diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c index 2efcb6c33a..8aea021081 100644 --- a/src/mainboard/asus/m2v-mx_se/romstage.c +++ b/src/mainboard/asus/m2v-mx_se/romstage.c @@ -37,7 +37,7 @@ unsigned int get_sbdn(unsigned bus); #include "northbridge/amd/amdk8/debug.c" #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include #include "northbridge/amd/amdk8/setup_resource_map.c" #include diff --git a/src/mainboard/asus/m2v/romstage.c b/src/mainboard/asus/m2v/romstage.c index c61557b2dd..e8053424e3 100644 --- a/src/mainboard/asus/m2v/romstage.c +++ b/src/mainboard/asus/m2v/romstage.c @@ -37,7 +37,7 @@ unsigned int get_sbdn(unsigned bus); #include "northbridge/amd/amdk8/debug.c" #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include #include "northbridge/amd/amdk8/setup_resource_map.c" #include diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c index 0c56074398..9ac02d033e 100644 --- a/src/mainboard/bcom/winnetp680/romstage.c +++ b/src/mainboard/bcom/winnetp680/romstage.c @@ -27,7 +27,7 @@ #include #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include #include @@ -84,7 +84,7 @@ void main(unsigned long bist) console_init(); enable_smbus(); - smbus_fixup(&ctrl); + smbus_fixup(ctrl.channel0, ARRAY_SIZE(ctrl.channel0)); /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); diff --git a/src/mainboard/jetway/j7f2/romstage.c b/src/mainboard/jetway/j7f2/romstage.c index 393f5e6764..5aee95d7cd 100644 --- a/src/mainboard/jetway/j7f2/romstage.c +++ b/src/mainboard/jetway/j7f2/romstage.c @@ -25,7 +25,7 @@ #include #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include #include #include @@ -88,7 +88,7 @@ void main(unsigned long bist) console_init(); enable_smbus(); - smbus_fixup(&ctrl); + smbus_fixup(ctrl.channel0, ARRAY_SIZE(ctrl.channel0)); /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c index 5293aa6387..27c1a46c6c 100644 --- a/src/mainboard/via/epia-cn/romstage.c +++ b/src/mainboard/via/epia-cn/romstage.c @@ -26,7 +26,7 @@ #include #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include "southbridge/via/vt8237r/early_serial.c" #include @@ -80,7 +80,7 @@ void main(unsigned long bist) enable_vt8237r_serial(); console_init(); enable_smbus(); - smbus_fixup(&ctrl); + smbus_fixup(ctrl.channel0, ARRAY_SIZE(ctrl.channel0)); report_bist_failure(bist); enable_mainboard_devices(); ddr_ram_setup(&ctrl); diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c index 1c10115492..57b59495c0 100644 --- a/src/mainboard/via/epia-m700/romstage.c +++ b/src/mainboard/via/epia-m700/romstage.c @@ -439,7 +439,7 @@ void main(unsigned long bist) enable_smbus(); /* This fix does help vx800!, but vx855 doesn't need this. */ - /* smbus_fixup(&ctrl); */ + /* smbus_fixup(ctrl.channel0, ARRAY_SIZE(ctrl.channel0)); */ /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c index 2f002be40e..7a2edbfd43 100644 --- a/src/mainboard/via/pc2500e/romstage.c +++ b/src/mainboard/via/pc2500e/romstage.c @@ -26,7 +26,7 @@ #include #include #include -#include "southbridge/via/vt8237r/early_smbus.c" +#include #include #include #include @@ -56,7 +56,7 @@ void main(unsigned long bist) ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); enable_smbus(); - smbus_fixup(&ctrl); + smbus_fixup(ctrl.channel0, ARRAY_SIZE(ctrl.channel0)); report_bist_failure(bist); ddr_ram_setup(&ctrl); } -- cgit v1.2.3