From c22a006a07191b4b9ebcd5d1b3d827f80a23479a Mon Sep 17 00:00:00 2001 From: proski Date: Wed, 17 Jun 2009 19:39:36 +0000 Subject: [PATCH] 2009-06-17 Pavel Roskin * 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. --- ChangeLog | 9 +++++++++ conf/i386-coreboot.rmk | 1 - kern/i386/coreboot/init.c | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90265d0af..e96652ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-06-17 Pavel Roskin + + * 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 * 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 b3c75ca18..c21e75938 100644 --- 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 6549a17e9..611e9d1b4 100644 --- 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 (); }