[1833] 2008-08-28 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 1833
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1833
Author:   proski
Date:     2008-08-29 01:08:05 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
2008-08-28  Pavel Roskin  <address@hidden>

        * conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): Add
        kern/time.c.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/conf/powerpc-ieee1275.mk
    trunk/grub2/conf/powerpc-ieee1275.rmk

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-08-28 19:08:21 UTC (rev 1832)
+++ trunk/grub2/ChangeLog       2008-08-29 01:08:05 UTC (rev 1833)
@@ -1,3 +1,8 @@
+2008-08-28  Pavel Roskin  <address@hidden>
+
+       * conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): Add
+       kern/time.c.
+
 2008-08-28  Robert Millan  <address@hidden>
 
        * util/biosdisk.c (find_grub_drive): Declare missing `i' variable.

Modified: trunk/grub2/conf/powerpc-ieee1275.mk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.mk        2008-08-28 19:08:21 UTC (rev 
1832)
+++ trunk/grub2/conf/powerpc-ieee1275.mk        2008-08-29 01:08:05 UTC (rev 
1833)
@@ -433,13 +433,13 @@
        kern/ieee1275/init.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/generic/millisleep.c kern/time.c                            \
        symlist.c kern/powerpc/cache.S
-CLEANFILES += kernel.elf kernel_elf-kern_powerpc_ieee1275_crt0.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-symlist.o kernel_elf-kern_powerpc_cache.o
-MOSTLYCLEANFILES += kernel_elf-kern_powerpc_ieee1275_crt0.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-symlist.d kernel_elf-kern_powerpc_cache.d
+CLEANFILES += kernel.elf kernel_elf-kern_powerpc_ieee1275_crt0.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_crt0.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
 
-kernel.elf: $(kernel_elf_DEPENDENCIES) kernel_elf-kern_powerpc_ieee1275_crt0.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-symlist.o kernel_elf-kern_powerpc_cache.o
-       $(TARGET_CC) -o $@ kernel_elf-kern_powerpc_ieee1275_crt0.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-symlist.o kernel_elf-kern_powerpc_cache.o $(TARGET_LDFLAGS) 
$(kernel_elf_LDFLAGS)
+kernel.elf: $(kernel_elf_DEPENDENCIES) kernel_elf-kern_powerpc_ieee1275_crt0.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_crt0.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-kern_powerpc_ieee1275_crt0.o: kern/powerpc/ieee1275/crt0.S 
$(kern/powerpc/ieee1275/crt0.S_DEPENDENCIES)
        $(TARGET_CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 
$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
@@ -537,6 +537,10 @@
        $(TARGET_CC) -Ikern/generic -I$(srcdir)/kern/generic $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
 -include kernel_elf-kern_generic_millisleep.d
 
+kernel_elf-kern_time.o: kern/time.c $(kern/time.c_DEPENDENCIES)
+       $(TARGET_CC) -Ikern -I$(srcdir)/kern $(TARGET_CPPFLAGS) 
$(TARGET_CFLAGS) $(kernel_elf_CFLAGS) -MD -c -o $@ $<
+-include kernel_elf-kern_time.d
+
 kernel_elf-symlist.o: symlist.c $(symlist.c_DEPENDENCIES)
        $(TARGET_CC) -I. -I$(srcdir)/. $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(kernel_elf_CFLAGS) -MD -c -o $@ $<
 -include kernel_elf-symlist.d

Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk       2008-08-28 19:08:21 UTC (rev 
1832)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk       2008-08-29 01:08:05 UTC (rev 
1833)
@@ -80,7 +80,7 @@
        kern/ieee1275/init.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/generic/millisleep.c kern/time.c                            \
        symlist.c kern/powerpc/cache.S
 kernel_elf_HEADERS = grub/powerpc/ieee1275/ieee1275.h
 kernel_elf_CFLAGS = $(COMMON_CFLAGS)