[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2373] 2009-06-29 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[2373] 2009-06-29 Robert Millan <address@hidden> |
Date: |
Mon, 29 Jun 2009 12:20:56 +0000 |
Revision: 2373
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2373
Author: robertmh
Date: 2009-06-29 12:20:56 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
2009-06-29 Robert Millan <address@hidden>
* include/grub/i386/linux.h (GRUB_LINUX_FLAG_QUIET): New macro.
* loader/i386/linux.c (grub_cmd_linux): Recognize "quiet" option,
and set GRUB_LINUX_FLAG_QUIET appropiately.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/include/grub/i386/linux.h
trunk/grub2/loader/i386/linux.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-29 12:19:08 UTC (rev 2372)
+++ trunk/grub2/ChangeLog 2009-06-29 12:20:56 UTC (rev 2373)
@@ -1,5 +1,11 @@
2009-06-29 Robert Millan <address@hidden>
+ * include/grub/i386/linux.h (GRUB_LINUX_FLAG_QUIET): New macro.
+ * loader/i386/linux.c (grub_cmd_linux): Recognize "quiet" option,
+ and set GRUB_LINUX_FLAG_QUIET appropiately.
+
+2009-06-29 Robert Millan <address@hidden>
+
Fix build on Debian / sparc.
* configure.ac: Recognize `sparc' target_cpu (as sparc64).
Modified: trunk/grub2/include/grub/i386/linux.h
===================================================================
--- trunk/grub2/include/grub/i386/linux.h 2009-06-29 12:19:08 UTC (rev
2372)
+++ trunk/grub2/include/grub/i386/linux.h 2009-06-29 12:20:56 UTC (rev
2373)
@@ -1,6 +1,6 @@
/*
* GRUB -- GRand Unified Bootloader
- * Copyright (C) 1999,2000,2001,2002,2003,2004,2007,2008 Free Software
Foundation, Inc.
+ * Copyright (C) 1999,2000,2001,2002,2003,2004,2007,2008,2009 Free Software
Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
#define GRUB_LINUX_MAGIC_SIGNATURE 0x53726448 /* "HdrS" */
#define GRUB_LINUX_DEFAULT_SETUP_SECTS 4
-#define GRUB_LINUX_FLAG_CAN_USE_HEAP 0x80
#define GRUB_LINUX_INITRD_MAX_ADDRESS 0x37FFFFFF
#define GRUB_LINUX_MAX_SETUP_SECTS 64
#define GRUB_LINUX_BOOT_LOADER_TYPE 0x72
@@ -33,6 +32,8 @@
#define GRUB_LINUX_SETUP_STACK 0x9000
#define GRUB_LINUX_FLAG_BIG_KERNEL 0x1
+#define GRUB_LINUX_FLAG_QUIET 0x20
+#define GRUB_LINUX_FLAG_CAN_USE_HEAP 0x80
/* Linux's video mode selection support. Actually I hate it! */
#define GRUB_LINUX_VID_MODE_NORMAL 0xFFFF
Modified: trunk/grub2/loader/i386/linux.c
===================================================================
--- trunk/grub2/loader/i386/linux.c 2009-06-29 12:19:08 UTC (rev 2372)
+++ trunk/grub2/loader/i386/linux.c 2009-06-29 12:20:56 UTC (rev 2373)
@@ -820,7 +820,12 @@
linux_mem_size <<= shift;
}
}
+ else if (grub_memcmp (argv[i], "quiet", sizeof ("quiet") - 1) == 0)
+ {
+ params->loadflags |= GRUB_LINUX_FLAG_QUIET;
+ }
+
/* Specify the boot file. */
dest = grub_stpcpy ((char *) real_mode_mem + GRUB_LINUX_CL_OFFSET,
"BOOT_IMAGE=");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2373] 2009-06-29 Robert Millan <address@hidden>,
Robert Millan <=