[2339] 2009-06-17 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2339
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2339
Author:   proski
Date:     2009-06-17 19:39:36 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
2009-06-17  Pavel Roskin  <address@hidden>

        * conf/i386-coreboot.rmk (kernel_elf_SOURCES): Remove
        term/i386/pc/at_keyboard.c, it doesn't need to be compiled into
        the kernel.
        * kern/i386/coreboot/init.c: Don't call grub_at_keyboard_init()
        and grub_at_keyboard_fini(), it's done on module load and
        unload.

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

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-17 17:19:23 UTC (rev 2338)
+++ trunk/grub2/ChangeLog       2009-06-17 19:39:36 UTC (rev 2339)
@@ -1,3 +1,12 @@
+2009-06-17  Pavel Roskin  <address@hidden>
+
+       * conf/i386-coreboot.rmk (kernel_elf_SOURCES): Remove
+       term/i386/pc/at_keyboard.c, it doesn't need to be compiled into
+       the kernel.
+       * kern/i386/coreboot/init.c: Don't call grub_at_keyboard_init()
+       and grub_at_keyboard_fini(), it's done on module load and
+       unload.
+
 2009-06-17  Felix Zielcke  <address@hidden>
 
        * loader/i386/linux.c (grub_cmd_linux): Set grub_error if the

Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk  2009-06-17 17:19:23 UTC (rev 2338)
+++ trunk/grub2/conf/i386-coreboot.rmk  2009-06-17 19:39:36 UTC (rev 2339)
@@ -25,7 +25,6 @@
        kern/generic/millisleep.c \
        kern/env.c \
        term/i386/pc/vga_text.c term/i386/vga_common.c \
-       term/i386/pc/at_keyboard.c \
        symlist.c
 kernel_elf_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \

Modified: trunk/grub2/kern/i386/coreboot/init.c
===================================================================
--- trunk/grub2/kern/i386/coreboot/init.c       2009-06-17 17:19:23 UTC (rev 
2338)
+++ trunk/grub2/kern/i386/coreboot/init.c       2009-06-17 19:39:36 UTC (rev 
2339)
@@ -75,7 +75,6 @@
 {
   /* Initialize the console as early as possible.  */
   grub_vga_text_init ();
-  grub_at_keyboard_init ();
 
   auto int NESTED_FUNC_ATTR heap_init (grub_uint64_t, grub_uint64_t, 
grub_uint32_t);
   int NESTED_FUNC_ATTR heap_init (grub_uint64_t addr, grub_uint64_t size, 
grub_uint32_t type)
@@ -137,7 +136,6 @@
 void
 grub_machine_fini (void)
 {
-  grub_at_keyboard_fini ();
   grub_vga_text_fini ();
   grub_stop_floppy ();
 }