mainboard/*/romstage.c: Fix 'lib/delay.c' inclusion

Use 'delay.h' header rather than directly including 'delay.c'
source. N.B. Some amdfam10 and K8 boards are not included in
this changeset since unrelated issues are woven in there.

Change-Id: Ibc0c0e560d8eedaf5c3150f95ba72fe5dd8d6f3a
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/8086
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

src/mainboard/a-trend/atc-6220/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/a-trend/atc-6240/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627hf/w83627hf.h>

src/mainboard/abit/be6-ii_v2_0/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 /* FIXME: It's a Winbond W83977EF, actually. */

src/mainboard/amd/dbm690t/romstage.c

@@ -27,7 +27,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 <cpu/x86/lapic.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include <superio/ite/common/ite.h>

src/mainboard/amd/mahogany/romstage.c

@@ -28,7 +28,7 @@
 #include <spd.h>
 #include <cpu/amd/model_fxx_rev.h>
 #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>

src/mainboard/amd/pistachio/romstage.c

@@ -27,7 +27,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 <cpu/x86/lapic.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include <spd.h>

src/mainboard/amd/serengeti_cheetah/romstage.c

@@ -12,7 +12,7 @@
 #include <northbridge/amd/amdk8/raminit.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include <cpu/x86/bist.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/mtrr.h>
 #include <superio/winbond/common/winbond.h>

src/mainboard/arima/hdama/romstage.c

@@ -9,7 +9,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/nsc/pc87360/pc87360.h>

src/mainboard/asrock/939a785gmh/romstage.c

@@ -28,7 +28,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"

src/mainboard/asus/a8n_e/romstage.c

@@ -41,7 +41,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/x86/bist.h>
 #include "northbridge/amd/amdk8/setup_resource_map.c"

src/mainboard/asus/a8v-e_deluxe/romstage.c

@@ -35,7 +35,7 @@ unsigned int get_sbdn(unsigned bus);
 #include <cpu/amd/model_fxx_rev.h>
 #include <halt.h>
 #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/early_ht.c"

src/mainboard/asus/a8v-e_se/romstage.c

@@ -35,7 +35,7 @@ unsigned int get_sbdn(unsigned bus);
 #include <cpu/amd/model_fxx_rev.h>
 #include <halt.h>
 #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/early_ht.c"

src/mainboard/asus/k8v-x/romstage.c

@@ -35,7 +35,7 @@ unsigned int get_sbdn(unsigned bus);
 #include <cpu/amd/model_fxx_rev.h>
 #include <halt.h>
 #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/early_ht.c"

src/mainboard/asus/m2v-mx_se/romstage.c

@@ -36,7 +36,7 @@ unsigned int get_sbdn(unsigned bus);
 #include <cpu/amd/model_fxx_rev.h>
 #include <halt.h>
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/ite/common/ite.h>

src/mainboard/asus/m2v/romstage.c

@@ -36,7 +36,7 @@ unsigned int get_sbdn(unsigned bus);
 #include <cpu/amd/model_fxx_rev.h>
 #include <halt.h>
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/ite/common/ite.h>

src/mainboard/asus/p2b-d/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/asus/p2b-ds/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/asus/p2b-f/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */

src/mainboard/asus/p2b-ls/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */

src/mainboard/asus/p2b/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/asus/p3b-f/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */

src/mainboard/azza/pt-6ibd/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 /* FIXME: It's a Winbond W83977EF, actually. */

src/mainboard/bcom/winnetp680/romstage.c

@@ -28,7 +28,7 @@
 #include <northbridge/via/cn700/raminit.h>
 #include <cpu/x86/bist.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <lib.h>
 #include <spd.h>
 #include "southbridge/via/vt8237r/early_smbus.c"

src/mainboard/biostar/m6tba/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/smsc/smscsuperio/smscsuperio.h>
 #include <lib.h>

src/mainboard/broadcom/blast/romstage.c

@@ -10,7 +10,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/broadcom/bcm5785/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"

src/mainboard/compaq/deskpro_en_sff_p600/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 /* FIXME: This should be PC97307 (but it's buggy at the moment)! */
 #include <superio/nsc/pc97317/pc97317.h>

src/mainboard/emulation/qemu-i440fx/romstage.c

@@ -27,7 +27,7 @@
 #include <cpu/x86/bist.h>
 #include <timestamp.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/lapic.h>
 
 #include "memory.c"

src/mainboard/emulation/qemu-q35/romstage.c

@@ -28,7 +28,7 @@
 #include <cpu/x86/bist.h>
 #include <timestamp.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/lapic.h>
 
 #include "../qemu-i440fx/memory.c"

src/mainboard/gigabyte/ga-6bxc/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/it8671f/it8671f.h>
 #include <lib.h>

src/mainboard/gigabyte/ga-6bxe/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/it8671f/it8671f.h>
 #include <lib.h>

src/mainboard/gigabyte/ga_2761gxdk/romstage.c

@@ -35,7 +35,7 @@
 #include <southbridge/sis/sis966/sis966.h>
 #include "southbridge/sis/sis966/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>

src/mainboard/hp/dl145_g3/romstage.c

@@ -37,7 +37,7 @@
 #include <cpu/amd/model_fxx_rev.h>
 #include "southbridge/broadcom/bcm5785/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/serverengines/pilot/pilot.h>

src/mainboard/hp/dl165_g6_fam10/romstage.c

@@ -43,7 +43,7 @@
 #include <northbridge/amd/amdfam10/amdfam10.h>
 #include <lib.h>
 #include <spd.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/lapic.h>
 #include "northbridge/amd/amdfam10/reset_test.c"
 #include <superio/serverengines/pilot/pilot.h>

src/mainboard/ibm/e325/romstage.c

@@ -10,7 +10,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/nsc/pc87366/pc87366.h>

src/mainboard/ibm/e326/romstage.c

@@ -10,7 +10,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/nsc/pc87366/pc87366.h>

src/mainboard/iwill/dk8_htx/romstage.c

@@ -11,7 +11,7 @@
 #include <northbridge/amd/amdk8/raminit.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include <cpu/x86/bist.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627hf/w83627hf.h>

src/mainboard/iwill/dk8s2/romstage.c

@@ -11,7 +11,7 @@
 #include <northbridge/amd/amdk8/raminit.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include <cpu/x86/bist.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627hf/w83627hf.h>

src/mainboard/iwill/dk8x/romstage.c

@@ -11,7 +11,7 @@
 #include <northbridge/amd/amdk8/raminit.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include <cpu/x86/bist.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83627hf/w83627hf.h>

src/mainboard/jetway/j7f2/romstage.c

@@ -28,7 +28,7 @@
 #include <northbridge/via/cn700/raminit.h>
 #include <cpu/x86/bist.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include "southbridge/via/vt8237r/early_smbus.c"
 #include <superio/fintek/common/fintek.h>
 #include <superio/fintek/f71805f/f71805f.h>

src/mainboard/kontron/kt690/romstage.c

@@ -28,7 +28,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"

src/mainboard/mitac/6513wu/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82801ax/i82801ax.h>
 #include <northbridge/intel/i82810/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/smsc/smscsuperio/smscsuperio.h>
 #include <lib.h>

src/mainboard/msi/ms6119/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/msi/ms6147/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/msi/ms6156/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/winbond/common/winbond.h>
 #include <superio/winbond/w83977tf/w83977tf.h>

src/mainboard/msi/ms7135/romstage.c

@@ -38,7 +38,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/x86/bist.h>
 #include "northbridge/amd/amdk8/setup_resource_map.c"

src/mainboard/msi/ms9185/romstage.c

@@ -35,7 +35,7 @@
 #include <cpu/amd/model_fxx_rev.h>
 #include "southbridge/broadcom/bcm5785/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include <reset.h>
 #include <cpu/x86/lapic.h>
 #include "northbridge/amd/amdk8/reset_test.c"

src/mainboard/newisys/khepri/romstage.c

@@ -17,7 +17,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/nokia/ip530/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/smsc/smscsuperio/smscsuperio.h>
 #include <lib.h>

src/mainboard/siemens/sitemp_g1p1/romstage.c

@@ -31,7 +31,7 @@
 
 #include <cpu/amd/model_fxx_rev.h>
 #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"

src/mainboard/soyo/sy-6ba-plus-iii/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/ite/it8671f/it8671f.h>
 #include <lib.h>

src/mainboard/sunw/ultra40/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #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"

src/mainboard/technexion/tim8690/romstage.c

@@ -27,7 +27,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"

src/mainboard/tyan/s1846/romstage.c

@@ -27,7 +27,7 @@
 #include <southbridge/intel/i82371eb/i82371eb.h>
 #include <northbridge/intel/i440bx/raminit.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <cpu/x86/bist.h>
 #include <superio/nsc/pc87309/pc87309.h>
 #include <lib.h>

src/mainboard/tyan/s2850/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s2875/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s2880/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s2881/romstage.c

@@ -11,7 +11,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s2882/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s2885/romstage.c

@@ -11,7 +11,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s2891/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #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"

src/mainboard/tyan/s2892/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #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"

src/mainboard/tyan/s2895/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #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/lpc47b397/lpc47b397.h>

src/mainboard/tyan/s4880/romstage.c

@@ -11,7 +11,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/tyan/s4882/romstage.c

@@ -10,7 +10,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include "southbridge/amd/amd8111/early_smbus.c"
 #include <northbridge/amd/amdk8/raminit.h>
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <superio/winbond/common/winbond.h>

src/mainboard/via/epia-cn/romstage.c

@@ -29,7 +29,7 @@
 #include <northbridge/via/cn700/raminit.h>
 #include <cpu/x86/bist.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include "southbridge/via/vt8237r/early_smbus.c"
 #include "southbridge/via/vt8235/early_serial.c"
 #include <spd.h>

src/mainboard/via/epia-m700/romstage.c

@@ -35,7 +35,7 @@
 #include <northbridge/via/vx800/vx800.h>
 #include <cpu/x86/bist.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include <string.h>
 /* This file contains the board-special SI value for raminit.c. */
 #include "driving_clk_phase_data.c"

src/mainboard/via/pc2500e/romstage.c

@@ -29,7 +29,7 @@
 #include <northbridge/via/cn700/raminit.h>
 #include <cpu/x86/bist.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include "southbridge/via/vt8237r/early_smbus.c"
 #include <superio/ite/common/ite.h>
 #include <superio/ite/it8716f/it8716f.h>

src/mainboard/via/vt8454c/romstage.c

@@ -29,7 +29,7 @@
 #include <northbridge/via/cx700/raminit.h>
 #include <cpu/x86/bist.h>
 #include "drivers/pc80/udelay_io.c"
-#include "lib/delay.c"
+#include <delay.h>
 #include "northbridge/via/cx700/early_smbus.c"
 #include "lib/debug.c"
 #include "northbridge/via/cx700/early_serial.c"

src/mainboard/winent/mb6047/romstage.c

@@ -12,7 +12,7 @@
 #include "northbridge/amd/amdk8/incoherent_ht.c"
 #include <southbridge/nvidia/ck804/early_smbus.h>
 #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"