From e2d15128a5a2468a5ce9db7c441810e0defae56e Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 9 Apr 2010 23:16:08 +0200 Subject: [PATCH] Fix grub-setup on sparc compilation --- conf/sparc64-ieee1275.rmk | 2 +- util/sparc64/ieee1275/grub-setup.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk index 78e511e31..ba891307a 100644 --- a/conf/sparc64-ieee1275.rmk +++ b/conf/sparc64-ieee1275.rmk @@ -51,7 +51,7 @@ grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \ util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c \ util/misc.c util/getroot.c kern/device.c kern/disk.c \ - kern/err.c kern/misc.c kern/parser.c kern/partition.c \ + kern/err.c kern/misc.c kern/partition.c \ kern/file.c kern/fs.c kern/env.c kern/list.c \ fs/fshelp.c \ \ diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c index c39ea853f..b5aa3ca85 100644 --- a/util/sparc64/ieee1275/grub-setup.c +++ b/util/sparc64/ieee1275/grub-setup.c @@ -82,21 +82,20 @@ struct boot_blocklist grub_uint32_t len; } __attribute__ ((packed)); -void -grub_putchar (int c) +void +grub_xputs_real (const char *str) { - putchar (c); + fputs (str, stdout); } +void (*grub_xputs) (const char *str) = grub_xputs_real; + int grub_getkey (void) { return -1; } -struct grub_handler_class grub_term_input_class; -struct grub_handler_class grub_term_output_class; - void grub_refresh (void) {