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>
This commit is contained in:
Patrick Georgi 2016-01-21 12:46:10 +01:00 committed by Patrick Georgi
parent a737940240
commit 82d9a31d9e
17 changed files with 17 additions and 17 deletions

View File

@ -69,7 +69,7 @@ $(foreach arch,$(ARCH_SUPPORTED),\
$(eval rmodules_$(arch)-y += rmodule.ld)) $(eval rmodules_$(arch)-y += rmodule.ld))
romstage-y += fmap.c romstage-y += fmap.c
romstage-$(CONFIG_I2C_TPM) += delay.c romstage-y += delay.c
romstage-y += cbfs.c romstage-y += cbfs.c
romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c

View File

@ -38,7 +38,7 @@ unsigned int get_sbdn(unsigned bus);
#include "southbridge/nvidia/ck804/early_smbus.h" #include "southbridge/nvidia/ck804/early_smbus.h"
#include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/raminit.h>
#include <northbridge/amd/amdfam10/amdfam10.h> #include <northbridge/amd/amdfam10/amdfam10.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -32,7 +32,7 @@
#include <cpu/amd/model_10xxx_rev.h> #include <cpu/amd/model_10xxx_rev.h>
#include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/raminit.h>
#include <northbridge/amd/amdfam10/amdfam10.h> #include <northbridge/amd/amdfam10/amdfam10.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include <superio/nuvoton/common/nuvoton.h> #include <superio/nuvoton/common/nuvoton.h>

View File

@ -28,7 +28,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <lib.h> #include <lib.h>
#include <spd.h> #include <spd.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>

View File

@ -28,7 +28,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include <superio/ite/common/ite.h> #include <superio/ite/common/ite.h>

View File

@ -28,7 +28,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <lib.h> #include <lib.h>
#include <spd.h> #include <spd.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>

View File

@ -29,7 +29,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/debug.c" #include "northbridge/amd/amdk8/debug.c"

View File

@ -33,7 +33,7 @@
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/raminit.h>
#include <northbridge/amd/amdfam10/amdfam10.h> #include <northbridge/amd/amdfam10/amdfam10.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -29,7 +29,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -29,7 +29,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include <superio/smsc/dme1737/dme1737.h> #include <superio/smsc/dme1737/dme1737.h>

View File

@ -26,7 +26,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -29,7 +29,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -33,7 +33,7 @@
#include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN
#include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/raminit.h>
#include <northbridge/amd/amdfam10/amdfam10.h> #include <northbridge/amd/amdfam10/amdfam10.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -33,7 +33,7 @@
#include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN #include "southbridge/nvidia/mcp55/early_smbus.c" // for enable the FAN
#include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/raminit.h>
#include <northbridge/amd/amdfam10/amdfam10.h> #include <northbridge/amd/amdfam10/amdfam10.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -23,7 +23,7 @@
#include <console/console.h> #include <console/console.h>
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <spd.h> #include <spd.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"

View File

@ -29,7 +29,7 @@
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdk8/raminit.h> #include <northbridge/amd/amdk8/raminit.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>

View File

@ -33,7 +33,7 @@
#include "southbridge/nvidia/mcp55/early_smbus.c" #include "southbridge/nvidia/mcp55/early_smbus.c"
#include <northbridge/amd/amdfam10/raminit.h> #include <northbridge/amd/amdfam10/raminit.h>
#include <northbridge/amd/amdfam10/amdfam10.h> #include <northbridge/amd/amdfam10/amdfam10.h>
#include "lib/delay.c" #include <delay.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include <superio/winbond/common/winbond.h> #include <superio/winbond/common/winbond.h>