diff options
author | Patrick Georgi <pgeorgi@chromium.org> | 2016-01-21 12:46:10 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2016-01-22 22:15:09 +0100 |
commit | 82d9a31d9edb89077b137f7a92776e5103bb0ec8 (patch) | |
tree | e3e1c8662adda2c827d6ea5d8faddb26c2f4065f | |
parent | a73794024060bec9ab0560d9f2dea7b129427033 (diff) | |
download | coreboot-82d9a31d9edb89077b137f7a92776e5103bb0ec8.tar.gz coreboot-82d9a31d9edb89077b137f7a92776e5103bb0ec8.tar.bz2 coreboot-82d9a31d9edb89077b137f7a92776e5103bb0ec8.zip |
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 <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/13115
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r-- | src/lib/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/asus/kfsn4-dre/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/asus/kgpe-d16/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/asus/m2n-e/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/gigabyte/m57sli/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/msi/ms7260/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/msi/ms9282/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/msi/ms9652_fam10/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/nvidia/l1_2pvv/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/sunw/ultra40m2/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/supermicro/h8dme/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/supermicro/h8dmr/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/supermicro/h8dmr_fam10/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/supermicro/h8qme_fam10/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/technexion/tim5690/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/tyan/s2912/romstage.c | 2 | ||||
-rw-r--r-- | src/mainboard/tyan/s2912_fam10/romstage.c | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index a4bcbcb60e14..30638bcf6dad 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 e7ad0b1b6562..05ba1f9d00db 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 <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/amdfam10.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c index 09de4b59c958..c29ac5ff4f23 100644 --- a/src/mainboard/asus/kgpe-d16/romstage.c +++ b/src/mainboard/asus/kgpe-d16/romstage.c @@ -32,7 +32,7 @@ #include <cpu/amd/model_10xxx_rev.h> #include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/amdfam10.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/nuvoton/common/nuvoton.h> diff --git a/src/mainboard/asus/m2n-e/romstage.c b/src/mainboard/asus/m2n-e/romstage.c index e2e17a220598..f9e5d4605518 100644 --- a/src/mainboard/asus/m2n-e/romstage.c +++ b/src/mainboard/asus/m2n-e/romstage.c @@ -28,7 +28,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <lib.h> #include <spd.h> #include <cpu/x86/lapic.h> diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c index 707ddc9ad901..67bf503baf70 100644 --- a/src/mainboard/gigabyte/m57sli/romstage.c +++ b/src/mainboard/gigabyte/m57sli/romstage.c @@ -28,7 +28,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" #include <superio/ite/common/ite.h> diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c index ab46b7266697..b3f9d4ef6223 100644 --- a/src/mainboard/msi/ms7260/romstage.c +++ b/src/mainboard/msi/ms7260/romstage.c @@ -28,7 +28,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <lib.h> #include <spd.h> #include <cpu/x86/lapic.h> diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c index b984ba50097b..04c5c3615b64 100644 --- a/src/mainboard/msi/ms9282/romstage.c +++ b/src/mainboard/msi/ms9282/romstage.c @@ -29,7 +29,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #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 f4413edead38..3af478555574 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 <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/amdfam10.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c index 4186cc70b66f..01095f683723 100644 --- a/src/mainboard/nvidia/l1_2pvv/romstage.c +++ b/src/mainboard/nvidia/l1_2pvv/romstage.c @@ -29,7 +29,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/sunw/ultra40m2/romstage.c b/src/mainboard/sunw/ultra40m2/romstage.c index 1006f1909b92..014c3b6e058b 100644 --- a/src/mainboard/sunw/ultra40m2/romstage.c +++ b/src/mainboard/sunw/ultra40m2/romstage.c @@ -29,7 +29,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" #include <superio/smsc/dme1737/dme1737.h> diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c index 1fbc766d2b53..b48ea46dc146 100644 --- a/src/mainboard/supermicro/h8dme/romstage.c +++ b/src/mainboard/supermicro/h8dme/romstage.c @@ -26,7 +26,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c index 05bdae5e50d3..96672e929b4a 100644 --- a/src/mainboard/supermicro/h8dmr/romstage.c +++ b/src/mainboard/supermicro/h8dmr/romstage.c @@ -29,7 +29,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index bf5093f417fc..7be3209ecba8 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 <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/amdfam10.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index 13a101185caa..4661f458f0d1 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 <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/amdfam10.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c index 645c6ca38db6..b94b06c416f1 100644 --- a/src/mainboard/technexion/tim5690/romstage.c +++ b/src/mainboard/technexion/tim5690/romstage.c @@ -23,7 +23,7 @@ #include <console/console.h> #include <cpu/amd/model_fxx_rev.h> #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <spd.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c index 155104972fcb..751cf71de09f 100644 --- a/src/mainboard/tyan/s2912/romstage.c +++ b/src/mainboard/tyan/s2912/romstage.c @@ -29,7 +29,7 @@ #include <cpu/amd/model_fxx_rev.h> #include "southbridge/nvidia/mcp55/early_smbus.c" #include <northbridge/amd/amdk8/raminit.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdk8/reset_test.c" #include <superio/winbond/common/winbond.h> diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index ed211d9c86c1..bd64cabf30af 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 <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/amdfam10.h> -#include "lib/delay.c" +#include <delay.h> #include <cpu/x86/lapic.h> #include "northbridge/amd/amdfam10/reset_test.c" #include <superio/winbond/common/winbond.h> |