2 files changed, 3 insertions, 59 deletions
diff --git a/src/arch/i386/firmware/pcbios/bios.c b/src/arch/i386/firmware/pcbios/bios.c
deleted file mode 100644
index bcbe98a88..000000000
--- a/src/arch/i386/firmware/pcbios/bios.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Etherboot routines for PCBIOS firmware.
- *
- * Body of routines taken from old pcbios.S
- */
-
-#include <stdint.h>
-#include <realmode.h>
-#include <bios.h>
-
-#define CF ( 1 << 0 )
-
-/**************************************************************************
-CURRTICKS - Get Time
-Use direct memory access to BIOS variables, longword 0040:006C (ticks
-today) and byte 0040:0070 (midnight crossover flag) instead of calling
-timeofday BIOS interrupt.
-**************************************************************************/
-#if defined(CONFIG_TSC_CURRTICKS)
-#undef CONFIG_BIOS_CURRTICKS
-#else
-#define CONFIG_BIOS_CURRTICKS 1
-#endif
-#if defined(CONFIG_BIOS_CURRTICKS)
-unsigned long currticks ( void ) {
-	static uint32_t days = 0;
-	uint32_t ticks;
-	uint8_t midnight;
-
-	/* Re-enable interrupts so that the timer interrupt can occur
-	 */
-	__asm__ __volatile__ ( REAL_CODE ( "sti\n\t"
-					   "nop\n\t"
-					   "nop\n\t"
-					   "cli\n\t" ) : : );
-
-	get_real ( ticks, BDA_SEG, 0x006c );
-	get_real ( midnight, BDA_SEG, 0x0070 );
-
-	if ( midnight ) {
-		midnight = 0;
-		put_real ( midnight, BDA_SEG, 0x0070 );
-		days += 0x1800b0;
-	}
-	return ( days + ticks );
-}
-#endif	/* CONFIG_BIOS_CURRTICKS */
-
-/**************************************************************************
-CPU_NAP - Save power by halting the CPU until the next interrupt
-**************************************************************************/
-void cpu_nap ( void ) {
-	__asm__ __volatile__ ( REAL_CODE ( "sti\n\t"
-					   "hlt\n\t"
-					   "cli\n\t" ) : : );
-}
diff --git a/src/arch/i386/firmware/pcbios/gateA20.c b/src/arch/i386/firmware/pcbios/gateA20.c
index 66b4da18a..2caac8941 100644
--- a/src/arch/i386/firmware/pcbios/gateA20.c
+++ b/src/arch/i386/firmware/pcbios/gateA20.c
@@ -1,8 +1,7 @@
 #include <stdio.h>
-#include "realmode.h"
-#include "timer.h"
-#include "latch.h"
-#include "bios.h"
+#include <realmode.h>
+#include <bios.h>
+#include <gpxe/timer.h>
 
 #define K_RDWR		0x60		/* keyboard data & cmds (read/write) */
 #define K_STATUS	0x64		/* keyboard status */