[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[1930] 2008-11-28 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[1930] 2008-11-28 Robert Millan <address@hidden> |
Date: |
Fri, 28 Nov 2008 19:56:20 +0000 |
Revision: 1930
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1930
Author: robertmh
Date: 2008-11-28 19:56:19 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
2008-11-28 Robert Millan <address@hidden>
Fix build on powerpc-ieee1275. Based on patch created by
Manoel Abranches <address@hidden>.
* conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): Add
`kern/ieee1275/mmap.c'.
* include/grub/powerpc/ieee1275/memory.h: New file.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/DISTLIST
trunk/grub2/conf/powerpc-ieee1275.mk
trunk/grub2/conf/powerpc-ieee1275.rmk
Added Paths:
-----------
trunk/grub2/include/grub/powerpc/ieee1275/memory.h
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-11-25 16:40:17 UTC (rev 1929)
+++ trunk/grub2/ChangeLog 2008-11-28 19:56:19 UTC (rev 1930)
@@ -1,3 +1,11 @@
+2008-11-28 Robert Millan <address@hidden>
+
+ Fix build on powerpc-ieee1275. Based on patch created by
+ Manoel Abranches <address@hidden>.
+ * conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): Add
+ `kern/ieee1275/mmap.c'.
+ * include/grub/powerpc/ieee1275/memory.h: New file.
+
2008-11-25 Felix Zielcke <address@hidden>
* util/grub-fstest.c (grub_term_get_current_input): Change return type
Modified: trunk/grub2/DISTLIST
===================================================================
--- trunk/grub2/DISTLIST 2008-11-25 16:40:17 UTC (rev 1929)
+++ trunk/grub2/DISTLIST 2008-11-28 19:56:19 UTC (rev 1930)
@@ -261,6 +261,7 @@
include/grub/powerpc/ieee1275/kernel.h
include/grub/powerpc/ieee1275/loader.h
include/grub/powerpc/ieee1275/machine.h
+include/grub/powerpc/ieee1275/memory.h
include/grub/powerpc/ieee1275/time.h
include/grub/powerpc/ieee1275/util/biosdisk.h
include/grub/sparc64/libgcc.h
Modified: trunk/grub2/conf/powerpc-ieee1275.mk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.mk 2008-11-25 16:40:17 UTC (rev
1929)
+++ trunk/grub2/conf/powerpc-ieee1275.mk 2008-11-28 19:56:19 UTC (rev
1930)
@@ -425,16 +425,18 @@
kern/ieee1275/ieee1275.c kern/main.c kern/device.c \
kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c \
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
- kern/ieee1275/init.c term/ieee1275/ofconsole.c \
+ kern/ieee1275/init.c \
+ kern/ieee1275/mmap.c \
+ term/ieee1275/ofconsole.c \
kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c \
kern/generic/millisleep.c kern/time.c \
symlist.c kern/powerpc/cache.S
-CLEANFILES += kernel.elf kernel_elf-kern_powerpc_ieee1275_startup.o
kernel_elf-kern_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o
kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o
kernel_elf-kern_dl.o kernel_elf-kern_err.o kernel_elf-kern_file.o
kernel_elf-kern_fs.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o
kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o
kernel_elf-kern_ieee1275_init.o kernel_elf-term_ieee1275_ofconsole.o
kernel_elf-kern_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o
kernel_elf-kern_parser.o kernel_elf-kern_partition.o kernel_elf-kern_env.o
kernel_elf-kern_powerpc_dl.o kernel_elf-kern_generic_millisleep.o
kernel_elf-kern_time.o kernel_elf-symlist.o kernel_elf-kern_powerpc_cache.o
-MOSTLYCLEANFILES += kernel_elf-kern_powerpc_ieee1275_startup.d
kernel_elf-kern_ieee1275_cmain.d kernel_elf-kern_ieee1275_ieee1275.d
kernel_elf-kern_main.d kernel_elf-kern_device.d kernel_elf-kern_disk.d
kernel_elf-kern_dl.d kernel_elf-kern_err.d kernel_elf-kern_file.d
kernel_elf-kern_fs.d kernel_elf-kern_misc.d kernel_elf-kern_mm.d
kernel_elf-kern_loader.d kernel_elf-kern_rescue.d kernel_elf-kern_term.d
kernel_elf-kern_ieee1275_init.d kernel_elf-term_ieee1275_ofconsole.d
kernel_elf-kern_ieee1275_openfw.d kernel_elf-disk_ieee1275_ofdisk.d
kernel_elf-kern_parser.d kernel_elf-kern_partition.d kernel_elf-kern_env.d
kernel_elf-kern_powerpc_dl.d kernel_elf-kern_generic_millisleep.d
kernel_elf-kern_time.d kernel_elf-symlist.d kernel_elf-kern_powerpc_cache.d
+CLEANFILES += kernel.elf kernel_elf-kern_powerpc_ieee1275_startup.o
kernel_elf-kern_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o
kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o
kernel_elf-kern_dl.o kernel_elf-kern_err.o kernel_elf-kern_file.o
kernel_elf-kern_fs.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o
kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o
kernel_elf-kern_ieee1275_init.o kernel_elf-kern_ieee1275_mmap.o
kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_ieee1275_openfw.o
kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o
kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o
kernel_elf-kern_generic_millisleep.o kernel_elf-kern_time.o
kernel_elf-symlist.o kernel_elf-kern_powerpc_cache.o
+MOSTLYCLEANFILES += kernel_elf-kern_powerpc_ieee1275_startup.d
kernel_elf-kern_ieee1275_cmain.d kernel_elf-kern_ieee1275_ieee1275.d
kernel_elf-kern_main.d kernel_elf-kern_device.d kernel_elf-kern_disk.d
kernel_elf-kern_dl.d kernel_elf-kern_err.d kernel_elf-kern_file.d
kernel_elf-kern_fs.d kernel_elf-kern_misc.d kernel_elf-kern_mm.d
kernel_elf-kern_loader.d kernel_elf-kern_rescue.d kernel_elf-kern_term.d
kernel_elf-kern_ieee1275_init.d kernel_elf-kern_ieee1275_mmap.d
kernel_elf-term_ieee1275_ofconsole.d kernel_elf-kern_ieee1275_openfw.d
kernel_elf-disk_ieee1275_ofdisk.d kernel_elf-kern_parser.d
kernel_elf-kern_partition.d kernel_elf-kern_env.d kernel_elf-kern_powerpc_dl.d
kernel_elf-kern_generic_millisleep.d kernel_elf-kern_time.d
kernel_elf-symlist.d kernel_elf-kern_powerpc_cache.d
-kernel.elf: $(kernel_elf_DEPENDENCIES)
kernel_elf-kern_powerpc_ieee1275_startup.o kernel_elf-kern_ieee1275_cmain.o
kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o
kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o
kernel_elf-kern_err.o kernel_elf-kern_file.o kernel_elf-kern_fs.o
kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o
kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_ieee1275_init.o
kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_ieee1275_openfw.o
kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o
kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o
kernel_elf-kern_generic_millisleep.o kernel_elf-kern_time.o
kernel_elf-symlist.o kernel_elf-kern_powerpc_cache.o
- $(TARGET_CC) -o $@ kernel_elf-kern_powerpc_ieee1275_startup.o
kernel_elf-kern_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o
kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o
kernel_elf-kern_dl.o kernel_elf-kern_err.o kernel_elf-kern_file.o
kernel_elf-kern_fs.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o
kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o
kernel_elf-kern_ieee1275_init.o kernel_elf-term_ieee1275_ofconsole.o
kernel_elf-kern_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o
kernel_elf-kern_parser.o kernel_elf-kern_partition.o kernel_elf-kern_env.o
kernel_elf-kern_powerpc_dl.o kernel_elf-kern_generic_millisleep.o
kernel_elf-kern_time.o kernel_elf-symlist.o kernel_elf-kern_powerpc_cache.o
$(TARGET_LDFLAGS) $(kernel_elf_LDFLAGS)
+kernel.elf: $(kernel_elf_DEPENDENCIES)
kernel_elf-kern_powerpc_ieee1275_startup.o kernel_elf-kern_ieee1275_cmain.o
kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o
kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o
kernel_elf-kern_err.o kernel_elf-kern_file.o kernel_elf-kern_fs.o
kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o
kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_ieee1275_init.o
kernel_elf-kern_ieee1275_mmap.o kernel_elf-term_ieee1275_ofconsole.o
kernel_elf-kern_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o
kernel_elf-kern_parser.o kernel_elf-kern_partition.o kernel_elf-kern_env.o
kernel_elf-kern_powerpc_dl.o kernel_elf-kern_generic_millisleep.o
kernel_elf-kern_time.o kernel_elf-symlist.o kernel_elf-kern_powerpc_cache.o
+ $(TARGET_CC) -o $@ kernel_elf-kern_powerpc_ieee1275_startup.o
kernel_elf-kern_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o
kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o
kernel_elf-kern_dl.o kernel_elf-kern_err.o kernel_elf-kern_file.o
kernel_elf-kern_fs.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o
kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o
kernel_elf-kern_ieee1275_init.o kernel_elf-kern_ieee1275_mmap.o
kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_ieee1275_openfw.o
kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o
kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o
kernel_elf-kern_generic_millisleep.o kernel_elf-kern_time.o
kernel_elf-symlist.o kernel_elf-kern_powerpc_cache.o $(TARGET_LDFLAGS)
$(kernel_elf_LDFLAGS)
kernel_elf-kern_powerpc_ieee1275_startup.o: kern/powerpc/ieee1275/startup.S
$(kern/powerpc/ieee1275/startup.S_DEPENDENCIES)
$(TARGET_CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
@@ -500,6 +502,10 @@
$(TARGET_CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
-include kernel_elf-kern_ieee1275_init.d
+kernel_elf-kern_ieee1275_mmap.o: kern/ieee1275/mmap.c
$(kern/ieee1275/mmap.c_DEPENDENCIES)
+ $(TARGET_CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
+-include kernel_elf-kern_ieee1275_mmap.d
+
kernel_elf-term_ieee1275_ofconsole.o: term/ieee1275/ofconsole.c
$(term/ieee1275/ofconsole.c_DEPENDENCIES)
$(TARGET_CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
-include kernel_elf-term_ieee1275_ofconsole.d
Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk 2008-11-25 16:40:17 UTC (rev
1929)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk 2008-11-28 19:56:19 UTC (rev
1930)
@@ -76,7 +76,9 @@
kern/ieee1275/ieee1275.c kern/main.c kern/device.c \
kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c \
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
- kern/ieee1275/init.c term/ieee1275/ofconsole.c \
+ kern/ieee1275/init.c \
+ kern/ieee1275/mmap.c \
+ term/ieee1275/ofconsole.c \
kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c \
kern/generic/millisleep.c kern/time.c \
Added: trunk/grub2/include/grub/powerpc/ieee1275/memory.h
===================================================================
--- trunk/grub2/include/grub/powerpc/ieee1275/memory.h
(rev 0)
+++ trunk/grub2/include/grub/powerpc/ieee1275/memory.h 2008-11-28 19:56:19 UTC
(rev 1930)
@@ -0,0 +1,24 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2008 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_MEMORY_MACHINE_HEADER
+#define GRUB_MEMORY_MACHINE_HEADER 1
+
+#define GRUB_MACHINE_MEMORY_AVAILABLE 1
+
+#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [1930] 2008-11-28 Robert Millan <address@hidden>,
Robert Millan <=