2005-08-31 Yoshinori K. Okuji <okuji@enbug.org>

        * DISTLIST: Replaced boot/powerpc/ieee1275/crt0.S and
        boot/powerpc/ieee1275/cmain.c with kern/powerpc/ieee1275/crt0.S
        and kern/powerpc/ieee1275/cmain.c, respectively.

        * boot/powerpc/ieee1275/crt0.S: Moved to ...
        * kern/powerpc/ieee1275/crt0.S: ... here.

        * boot/powerpc/ieee1275/cmain.c: Moved to ...
        * kern/powerpc/ieee1275/cmain.c: ... here.

        * conf/powerpc-ieee1275.rmk (grubof_SOURCES): Use
        kern/powerpc/ieee1275/crt0.S and kern/powerpc/ieee1275/cmain.c
        instead of boot/powerpc/ieee1275/crt0.S and
        boot/powerpc/ieee1275/cmain.c, respectively.

        * boot/i386/pc/boot.S (lba_mode): Do not store the total number of
        sectors. It was not used anyway.

diff --git a/ChangeLog b/ChangeLog
index e61db32dfca57ce286a1fd2cf622e3173ec71a18..f063e7f32e108f46bf7f05f60534605fbf0509b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-08-31  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * DISTLIST: Replaced boot/powerpc/ieee1275/crt0.S and
+       boot/powerpc/ieee1275/cmain.c with kern/powerpc/ieee1275/crt0.S
+       and kern/powerpc/ieee1275/cmain.c, respectively.
+
+       * boot/powerpc/ieee1275/crt0.S: Moved to ...
+       * kern/powerpc/ieee1275/crt0.S: ... here.
+
+       * boot/powerpc/ieee1275/cmain.c: Moved to ...
+       * kern/powerpc/ieee1275/cmain.c: ... here.
+       
+       * conf/powerpc-ieee1275.rmk (grubof_SOURCES): Use
+       kern/powerpc/ieee1275/crt0.S and kern/powerpc/ieee1275/cmain.c
+       instead of boot/powerpc/ieee1275/crt0.S and
+       boot/powerpc/ieee1275/cmain.c, respectively.
+
+       * boot/i386/pc/boot.S (lba_mode): Do not store the total number of
+       sectors. It was not used anyway.
+
 2005-08-30  Hollis Blanchard  <hollis@penguinppc.org>
 
        * term/ieee1275/ofconsole.c (grub_ofconsole_getcharwidth): Fix

diff --git a/DISTLIST b/DISTLIST
index 3a101bf8c07de8d76c562fed1a3d8921eebd2435..3325fc61533ce046d59172719bf9274e2a3275fc 100644 (file)
--- a/DISTLIST
+++ b/DISTLIST
@@ -28,8 +28,6 @@ stamp-h.in
 boot/i386/pc/boot.S
 boot/i386/pc/diskboot.S
 boot/i386/pc/pxeboot.S
-boot/powerpc/ieee1275/cmain.c
-boot/powerpc/ieee1275/crt0.S
 commands/boot.c
 commands/cat.c
 commands/cmp.c
@@ -153,6 +151,8 @@ kern/i386/pc/startup.S
 kern/ieee1275/ieee1275.c
 kern/powerpc/cache.S
 kern/powerpc/dl.c
+kern/powerpc/ieee1275/cmain.c
+kern/powerpc/ieee1275/crt0.S
 kern/powerpc/ieee1275/init.c
 kern/powerpc/ieee1275/openfw.c
 kern/sparc64/cache.c

diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 0d7f4279def412759f169da4c8454df4dc5f6043..13ecca7758a71608f7b7b76d943e5309f4be6514 100644 (file)
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -184,9 +184,6 @@ real_start:
        jz      chs_mode
        
 lba_mode:
-       /* save the total number of sectors */
-       movl    0x10(%si), %ecx
-
        /* set %si to the disk address packet */
        movw    $ABS(disk_address_packet), %si
 

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 9243f3892771e8bd86003a77887cab2a7b55cff6..514fbc293ed975688094d354a810d1f5134c5675 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -523,7 +523,7 @@ grub_emu-util_powerpc_ieee1275_misc.d: util/powerpc/ieee1275/misc.c
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-grubof_SOURCES = boot/powerpc/ieee1275/crt0.S boot/powerpc/ieee1275/cmain.c \
+grubof_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \
        kern/ieee1275/ieee1275.c kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
        kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
@@ -531,27 +531,27 @@ grubof_SOURCES = boot/powerpc/ieee1275/crt0.S boot/powerpc/ieee1275/cmain.c \
        kern/powerpc/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
        kern/partition.c kern/env.c kern/powerpc/dl.c grubof_symlist.c \
        kern/powerpc/cache.S
-CLEANFILES += grubof grubof-boot_powerpc_ieee1275_crt0.o grubof-boot_powerpc_ieee1275_cmain.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-kern_powerpc_ieee1275_init.o grubof-term_ieee1275_ofconsole.o grubof-kern_powerpc_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_powerpc_dl.o grubof-grubof_symlist.o grubof-kern_powerpc_cache.o
-MOSTLYCLEANFILES += grubof-boot_powerpc_ieee1275_crt0.d grubof-boot_powerpc_ieee1275_cmain.d grubof-kern_ieee1275_ieee1275.d grubof-kern_main.d grubof-kern_device.d grubof-kern_disk.d grubof-kern_dl.d grubof-kern_file.d grubof-kern_fs.d grubof-kern_err.d grubof-kern_misc.d grubof-kern_mm.d grubof-kern_loader.d grubof-kern_rescue.d grubof-kern_term.d grubof-kern_powerpc_ieee1275_init.d grubof-term_ieee1275_ofconsole.d grubof-kern_powerpc_ieee1275_openfw.d grubof-disk_ieee1275_ofdisk.d grubof-kern_partition.d grubof-kern_env.d grubof-kern_powerpc_dl.d grubof-grubof_symlist.d grubof-kern_powerpc_cache.d
+CLEANFILES += grubof grubof-kern_powerpc_ieee1275_crt0.o grubof-kern_powerpc_ieee1275_cmain.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-kern_powerpc_ieee1275_init.o grubof-term_ieee1275_ofconsole.o grubof-kern_powerpc_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_powerpc_dl.o grubof-grubof_symlist.o grubof-kern_powerpc_cache.o
+MOSTLYCLEANFILES += grubof-kern_powerpc_ieee1275_crt0.d grubof-kern_powerpc_ieee1275_cmain.d grubof-kern_ieee1275_ieee1275.d grubof-kern_main.d grubof-kern_device.d grubof-kern_disk.d grubof-kern_dl.d grubof-kern_file.d grubof-kern_fs.d grubof-kern_err.d grubof-kern_misc.d grubof-kern_mm.d grubof-kern_loader.d grubof-kern_rescue.d grubof-kern_term.d grubof-kern_powerpc_ieee1275_init.d grubof-term_ieee1275_ofconsole.d grubof-kern_powerpc_ieee1275_openfw.d grubof-disk_ieee1275_ofdisk.d grubof-kern_partition.d grubof-kern_env.d grubof-kern_powerpc_dl.d grubof-grubof_symlist.d grubof-kern_powerpc_cache.d
 
-grubof: grubof-boot_powerpc_ieee1275_crt0.o grubof-boot_powerpc_ieee1275_cmain.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-kern_powerpc_ieee1275_init.o grubof-term_ieee1275_ofconsole.o grubof-kern_powerpc_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_powerpc_dl.o grubof-grubof_symlist.o grubof-kern_powerpc_cache.o
+grubof: grubof-kern_powerpc_ieee1275_crt0.o grubof-kern_powerpc_ieee1275_cmain.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-kern_powerpc_ieee1275_init.o grubof-term_ieee1275_ofconsole.o grubof-kern_powerpc_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_powerpc_dl.o grubof-grubof_symlist.o grubof-kern_powerpc_cache.o
        $(CC) -o $@ $^ $(LDFLAGS) $(grubof_LDFLAGS)
 
-grubof-boot_powerpc_ieee1275_crt0.o: boot/powerpc/ieee1275/crt0.S
-       $(CC) -Iboot/powerpc/ieee1275 -I$(srcdir)/boot/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $<
+grubof-kern_powerpc_ieee1275_crt0.o: kern/powerpc/ieee1275/crt0.S
+       $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $<
 
-grubof-boot_powerpc_ieee1275_crt0.d: boot/powerpc/ieee1275/crt0.S
-       set -e;           $(CC) -Iboot/powerpc/ieee1275 -I$(srcdir)/boot/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $<    | sed 's,crt0\.o[ :]*,grubof-boot_powerpc_ieee1275_crt0.o $@ : ,g' > $@;        [ -s $@ ] || rm -f $@
+grubof-kern_powerpc_ieee1275_crt0.d: kern/powerpc/ieee1275/crt0.S
+       set -e;           $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $<    | sed 's,crt0\.o[ :]*,grubof-kern_powerpc_ieee1275_crt0.o $@ : ,g' > $@;        [ -s $@ ] || rm -f $@
 
--include grubof-boot_powerpc_ieee1275_crt0.d
+-include grubof-kern_powerpc_ieee1275_crt0.d
 
-grubof-boot_powerpc_ieee1275_cmain.o: boot/powerpc/ieee1275/cmain.c
-       $(CC) -Iboot/powerpc/ieee1275 -I$(srcdir)/boot/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $<
+grubof-kern_powerpc_ieee1275_cmain.o: kern/powerpc/ieee1275/cmain.c
+       $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $<
 
-grubof-boot_powerpc_ieee1275_cmain.d: boot/powerpc/ieee1275/cmain.c
-       set -e;           $(CC) -Iboot/powerpc/ieee1275 -I$(srcdir)/boot/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $<    | sed 's,cmain\.o[ :]*,grubof-boot_powerpc_ieee1275_cmain.o $@ : ,g' > $@;      [ -s $@ ] || rm -f $@
+grubof-kern_powerpc_ieee1275_cmain.d: kern/powerpc/ieee1275/cmain.c
+       set -e;           $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $<    | sed 's,cmain\.o[ :]*,grubof-kern_powerpc_ieee1275_cmain.o $@ : ,g' > $@;      [ -s $@ ] || rm -f $@
 
--include grubof-boot_powerpc_ieee1275_cmain.d
+-include grubof-kern_powerpc_ieee1275_cmain.d
 
 grubof-kern_ieee1275_ieee1275.o: kern/ieee1275/ieee1275.c
        $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $<

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 74b4975303eb3564b52e1b585da8fe3496109e16..12110a172986d49314423eb5b392c337a53458c3 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -55,7 +55,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c      \
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-grubof_SOURCES = boot/powerpc/ieee1275/crt0.S boot/powerpc/ieee1275/cmain.c \
+grubof_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \
        kern/ieee1275/ieee1275.c kern/main.c kern/device.c \
        kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
        kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \

diff --git a/boot/powerpc/ieee1275/cmain.c b/kern/powerpc/ieee1275/cmain.c
similarity index 100%
rename from boot/powerpc/ieee1275/cmain.c
rename to kern/powerpc/ieee1275/cmain.c

diff --git a/boot/powerpc/ieee1275/crt0.S b/kern/powerpc/ieee1275/crt0.S
similarity index 100%
rename from boot/powerpc/ieee1275/crt0.S
rename to kern/powerpc/ieee1275/crt0.S