[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2363] 2009-06-22 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[2363] 2009-06-22 Robert Millan <address@hidden> |
Date: |
Mon, 22 Jun 2009 20:40:29 +0000 |
Revision: 2363
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2363
Author: robertmh
Date: 2009-06-22 20:40:28 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
2009-06-22 Robert Millan <address@hidden>
* include/grub/i386/kernel.h: Include `<grub/machine/machine.h>'.
[! GRUB_MACHINE_IEEE1275]: Set `GRUB_MOD_ALIGN' to 0x1.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/include/grub/i386/kernel.h
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-22 20:19:13 UTC (rev 2362)
+++ trunk/grub2/ChangeLog 2009-06-22 20:40:28 UTC (rev 2363)
@@ -1,5 +1,10 @@
2009-06-22 Robert Millan <address@hidden>
+ * include/grub/i386/kernel.h: Include `<grub/machine/machine.h>'.
+ [! GRUB_MACHINE_IEEE1275]: Set `GRUB_MOD_ALIGN' to 0x1.
+
+2009-06-22 Robert Millan <address@hidden>
+
* commands/search.c (grub_cmd_search): Macroify hardcoded args[]
indexes. Check for -f explicitly.
(search_file): Improve error message.
Modified: trunk/grub2/include/grub/i386/kernel.h
===================================================================
--- trunk/grub2/include/grub/i386/kernel.h 2009-06-22 20:19:13 UTC (rev
2362)
+++ trunk/grub2/include/grub/i386/kernel.h 2009-06-22 20:40:28 UTC (rev
2363)
@@ -1,6 +1,6 @@
/*
* GRUB -- GRand Unified Bootloader
- * Copyright (C) 2005,2006,2007,2008 Free Software Foundation, Inc.
+ * Copyright (C) 2005,2006,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
@@ -19,8 +19,14 @@
#ifndef GRUB_KERNEL_CPU_HEADER
#define GRUB_KERNEL_CPU_HEADER 1
-#define GRUB_MOD_ALIGN 0x1000
+#include <grub/machine/machine.h>
+#ifdef GRUB_MACHINE_IEEE1275
+#define GRUB_MOD_ALIGN 0x1000
+#else
+#define GRUB_MOD_ALIGN 0x1
+#endif
+
/* Non-zero value is only needed for PowerMacs. */
#define GRUB_MOD_GAP 0x0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2363] 2009-06-22 Robert Millan <address@hidden>,
Robert Millan <=