2009-06-17 Pavel Roskin <proski@gnu.org>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 90265d0afc07232b19301987827c46728a256ce9..e96652ba209f9784ade91767d1ea51ebf82e41a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-17  Pavel Roskin  <proski@gnu.org>
+
+       * 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  <fzielcke@z-51.de>
 
        * loader/i386/linux.c (grub_cmd_linux): Set grub_error if the

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index b3c75ca189dc69a2fc2e1e7a4b4f86b2e98c0a3d..c21e759381270d19d393e5c1390763e391dd9f8d 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -25,7 +25,6 @@ kernel_elf_SOURCES = kern/i386/coreboot/startup.S \
        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 \

diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 6549a17e99f7fb4a9ac22939ea7aed2715002e17..611e9d1b419cd35fdc9ac80b6c13780fb794098b 100644 (file)
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -75,7 +75,6 @@ grub_machine_init (void)
 {
   /* 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 @@ grub_machine_set_prefix (void)
 void
 grub_machine_fini (void)
 {
-  grub_at_keyboard_fini ();
   grub_vga_text_fini ();
   grub_stop_floppy ();
 }