[1784] 2008-08-06 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1784
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1784
Author:   robertmh
Date:     2008-08-06 12:27:28 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
2008-08-06  Robert Millan  <address@hidden>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/conf/i386-coreboot.mk
    trunk/grub2/conf/i386-coreboot.rmk
    trunk/grub2/kern/i386/tsc.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-08-06 06:17:14 UTC (rev 1783)
+++ trunk/grub2/ChangeLog       2008-08-06 12:27:28 UTC (rev 1784)
@@ -1,3 +1,8 @@
+2008-08-06  Robert Millan  <address@hidden>
+
+       * conf/i386-coreboot.rmk (kernel_elf_ASFLAGS): New variable.
+       * kern/i386/tsc.c: Include `<grub/i386/pit.h>'.
+
 2008-08-06  Bean  <address@hidden>
 
        * fs/i386/pc/pxe.c (grub_pxe_data): New member block_size.

Modified: trunk/grub2/conf/i386-coreboot.mk
===================================================================
--- trunk/grub2/conf/i386-coreboot.mk   2008-08-06 06:17:14 UTC (rev 1783)
+++ trunk/grub2/conf/i386-coreboot.mk   2008-08-06 12:27:28 UTC (rev 1784)
@@ -150,6 +150,7 @@
        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

Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk  2008-08-06 06:17:14 UTC (rev 1783)
+++ trunk/grub2/conf/i386-coreboot.rmk  2008-08-06 12:27:28 UTC (rev 1784)
@@ -31,6 +31,7 @@
        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

Modified: trunk/grub2/kern/i386/tsc.c
===================================================================
--- trunk/grub2/kern/i386/tsc.c 2008-08-06 06:17:14 UTC (rev 1783)
+++ trunk/grub2/kern/i386/tsc.c 2008-08-06 12:27:28 UTC (rev 1784)
@@ -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;