vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
proski 2009-06-17 19:39:36 +00:00
parent 05b129e0d3
commit c22a006a07
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2009-06-17 Felix Zielcke <fzielcke@z-51.de>
* loader/i386/linux.c (grub_cmd_linux): Set grub_error if the * loader/i386/linux.c (grub_cmd_linux): Set grub_error if the

1
conf/i386-coreboot.rmk
View file

@ -25,7 +25,6 @@ kernel_elf_SOURCES = kern/i386/coreboot/startup.S \
kern/generic/millisleep.c \ kern/generic/millisleep.c \
kern/env.c \ kern/env.c \
term/i386/pc/vga_text.c term/i386/vga_common.c \ term/i386/pc/vga_text.c term/i386/vga_common.c \
term/i386/pc/at_keyboard.c \
symlist.c symlist.c
kernel_elf_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \ 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 \ env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \

2
kern/i386/coreboot/init.c
View file

@ -75,7 +75,6 @@ grub_machine_init (void)
{ {
/* Initialize the console as early as possible. */ /* Initialize the console as early as possible. */
grub_vga_text_init (); grub_vga_text_init ();
grub_at_keyboard_init ();
auto int NESTED_FUNC_ATTR heap_init (grub_uint64_t, grub_uint64_t, grub_uint32_t); 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) 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 void
grub_machine_fini (void) grub_machine_fini (void)
{ {
grub_at_keyboard_fini ();
grub_vga_text_fini (); grub_vga_text_fini ();
grub_stop_floppy (); grub_stop_floppy ();
} }