2008-08-06 Robert Millan <rmh@aybabtu.com>

        * conf/i386-coreboot.rmk (kernel_elf_ASFLAGS): New variable.
        * kern/i386/tsc.c: Include `<grub/i386/pit.h>'.

diff --git a/ChangeLog b/ChangeLog
index 4f85589385cd0ac51c110230cc8b85d0acf82ff4..156a167e5eb408ced2e4bc5c7e17acb170e1c759 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Robert Millan  <rmh@aybabtu.com>
+
+       * conf/i386-coreboot.rmk (kernel_elf_ASFLAGS): New variable.
+       * kern/i386/tsc.c: Include `<grub/i386/pit.h>'.
+
 2008-08-06  Bean  <bean123ch@gmail.com>
 
        * fs/i386/pc/pxe.c (grub_pxe_data): New member block_size.

diff --git a/conf/i386-coreboot.mk b/conf/i386-coreboot.mk
index 6f68a0e51f1f2c4bce0f3fd71d1922e577abf13c..f766b9f4be3dba3d4ea128537df50371691360e5 100644 (file)
--- a/conf/i386-coreboot.mk
+++ b/conf/i386-coreboot.mk
@@ -150,6 +150,7 @@ kernel_elf_HEADERS = arg.h boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        machine/boot.h machine/console.h machine/init.h \
        machine/memory.h machine/loader.h
 kernel_elf_CFLAGS = $(COMMON_CFLAGS)
+kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
 
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 5aee1f8c201d511523ff10abb68eded0c3f6177d..4827c0f819a0addffb1e9314631f664aaf56ab61 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -31,6 +31,7 @@ kernel_elf_HEADERS = arg.h boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        machine/boot.h machine/console.h machine/init.h \
        machine/memory.h machine/loader.h
 kernel_elf_CFLAGS = $(COMMON_CFLAGS)
+kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
 
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst

diff --git a/kern/i386/tsc.c b/kern/i386/tsc.c
index 458fc0ec9e5f3019ae9c9a51d28c608588330870..4d3f05a26b6de84180815c95ae77893215f50f3b 100644 (file)
--- a/kern/i386/tsc.c
+++ b/kern/i386/tsc.c
@@ -24,6 +24,7 @@
 #include <grub/time.h>
 #include <grub/misc.h>
 #include <grub/i386/tsc.h>
+#include <grub/i386/pit.h>
 
 /* This defines the value TSC had at the epoch (that is, when we calibrated it). */
 static grub_uint64_t tsc_boot_time;