From 82d9a31d9edb89077b137f7a92776e5103bb0ec8 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 21 Jan 2016 12:46:10 +0100 Subject: lib: compile mdelay for romstage Mimicking change I7037308d2, always compile mdelay for romstage. The boards that #included delay.c in the romstage now rely on the linker instead, which is a desirable cleanup. Change-Id: I7e5169ec94e5417536e967194e8eab67381e7c98 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/13115 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/lib/Makefile.inc | 2 +- src/mainboard/asus/kfsn4-dre/romstage.c | 2 +- src/mainboard/asus/kgpe-d16/romstage.c | 2 +- src/mainboard/asus/m2n-e/romstage.c | 2 +- src/mainboard/gigabyte/m57sli/romstage.c | 2 +- src/mainboard/msi/ms7260/romstage.c | 2 +- src/mainboard/msi/ms9282/romstage.c | 2 +- src/mainboard/msi/ms9652_fam10/romstage.c | 2 +- src/mainboard/nvidia/l1_2pvv/romstage.c | 2 +- src/mainboard/sunw/ultra40m2/romstage.c | 2 +- src/mainboard/supermicro/h8dme/romstage.c | 2 +- src/mainboard/supermicro/h8dmr/romstage.c | 2 +- src/mainboard/supermicro/h8dmr_fam10/romstage.c | 2 +- src/mainboard/supermicro/h8qme_fam10/romstage.c | 2 +- src/mainboard/technexion/tim5690/romstage.c | 2 +- src/mainboard/tyan/s2912/romstage.c | 2 +- src/mainboard/tyan/s2912_fam10/romstage.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index a4bcbcb60e..30638bcf6d 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -69,7 +69,7 @@ $(foreach arch,$(ARCH_SUPPORTED),\ $(eval rmodules_$(arch)-y += rmodule.ld)) romstage-y += fmap.c -romstage-$(CONFIG_I2C_TPM) += delay.c +romstage-y += delay.c romstage-y += cbfs.c romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c index e7ad0b1b65..05ba1f9d00 100644 --- a/src/mainboard/asus/kfsn4-dre/romstage.c +++ b/src/mainboard/asus/kfsn4-dre/romstage.c @@ -38,7 +38,7 @@ unsigned int get_sbdn(unsigned bus); #include "southbridge/nvidia/ck804/early_smbus.h" #include #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdfam10/reset_test.c" #include diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c index 09de4b59c9..c29ac5ff4f 100644 --- a/src/mainboard/asus/kgpe-d16/romstage.c +++ b/src/mainboard/asus/kgpe-d16/romstage.c @@ -32,7 +32,7 @@ #include #include #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdfam10/reset_test.c" #include diff --git a/src/mainboard/asus/m2n-e/romstage.c b/src/mainboard/asus/m2n-e/romstage.c index e2e17a2205..f9e5d46055 100644 --- a/src/mainboard/asus/m2n-e/romstage.c +++ b/src/mainboard/asus/m2n-e/romstage.c @@ -28,7 +28,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include #include diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c index 707ddc9ad9..67bf503baf 100644 --- a/src/mainboard/gigabyte/m57sli/romstage.c +++ b/src/mainboard/gigabyte/m57sli/romstage.c @@ -28,7 +28,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c index ab46b72666..b3f9d4ef62 100644 --- a/src/mainboard/msi/ms7260/romstage.c +++ b/src/mainboard/msi/ms7260/romstage.c @@ -28,7 +28,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include #include diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c index b984ba5009..04c5c3615b 100644 --- a/src/mainboard/msi/ms9282/romstage.c +++ b/src/mainboard/msi/ms9282/romstage.c @@ -29,7 +29,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/debug.c" diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c index f4413edead..3af4785555 100644 --- a/src/mainboard/msi/ms9652_fam10/romstage.c +++ b/src/mainboard/msi/ms9652_fam10/romstage.c @@ -33,7 +33,7 @@ #include "southbridge/nvidia/mcp55/early_smbus.c" #include #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdfam10/reset_test.c" #include diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c index 4186cc70b6..01095f6837 100644 --- a/src/mainboard/nvidia/l1_2pvv/romstage.c +++ b/src/mainboard/nvidia/l1_2pvv/romstage.c @@ -29,7 +29,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include diff --git a/src/mainboard/sunw/ultra40m2/romstage.c b/src/mainboard/sunw/ultra40m2/romstage.c index 1006f1909b..014c3b6e05 100644 --- a/src/mainboard/sunw/ultra40m2/romstage.c +++ b/src/mainboard/sunw/ultra40m2/romstage.c @@ -29,7 +29,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c index 1fbc766d2b..b48ea46dc1 100644 --- a/src/mainboard/supermicro/h8dme/romstage.c +++ b/src/mainboard/supermicro/h8dme/romstage.c @@ -26,7 +26,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c index 05bdae5e50..96672e929b 100644 --- a/src/mainboard/supermicro/h8dmr/romstage.c +++ b/src/mainboard/supermicro/h8dmr/romstage.c @@ -29,7 +29,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index bf5093f417..7be3209ecb 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c +++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c @@ -33,7 +33,7 @@ #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdfam10/reset_test.c" #include diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index 13a101185c..4661f458f0 100644 --- a/src/mainboard/supermicro/h8qme_fam10/romstage.c +++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c @@ -33,7 +33,7 @@ #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdfam10/reset_test.c" #include diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c index 645c6ca38d..b94b06c416 100644 --- a/src/mainboard/technexion/tim5690/romstage.c +++ b/src/mainboard/technexion/tim5690/romstage.c @@ -23,7 +23,7 @@ #include #include #include -#include "lib/delay.c" +#include #include #include #include "northbridge/amd/amdk8/reset_test.c" diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c index 155104972f..751cf71de0 100644 --- a/src/mainboard/tyan/s2912/romstage.c +++ b/src/mainboard/tyan/s2912/romstage.c @@ -29,7 +29,7 @@ #include #include "southbridge/nvidia/mcp55/early_smbus.c" #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdk8/reset_test.c" #include diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index ed211d9c86..bd64cabf30 100644 --- a/src/mainboard/tyan/s2912_fam10/romstage.c +++ b/src/mainboard/tyan/s2912_fam10/romstage.c @@ -33,7 +33,7 @@ #include "southbridge/nvidia/mcp55/early_smbus.c" #include #include -#include "lib/delay.c" +#include #include #include "northbridge/amd/amdfam10/reset_test.c" #include -- cgit v1.2.3