2005-10-01 Hollis Blanchard <hollis@penguinppc.org>

	* kern/powerpc/ieee1275/cmain.c (cmain): Remove incomplete Old World
	PowerMac support.

diff --git a/ChangeLog b/ChangeLog
index 1d280b407e6a264acd3ce49691ee088fe2603e22..23f0187cf038f41b222b838e8b023ec99dde90e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-01  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * kern/powerpc/ieee1275/cmain.c (cmain): Remove incomplete Old World
+       PowerMac support.
+
 2005-10-01  Hollis Blanchard  <hollis@penguinppc.org>
 
        * disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Cast `size' to long.

diff --git a/kern/powerpc/ieee1275/cmain.c b/kern/powerpc/ieee1275/cmain.c
index 378040906f7b4c6c33ba564f4d0f89a118571058..d0127eef619a7ce900be237cfffa20c5ba16fbae 100644 (file)
--- a/kern/powerpc/ieee1275/cmain.c
+++ b/kern/powerpc/ieee1275/cmain.c
@@ -25,7 +25,6 @@
 #include <grub/machine/kernel.h>
 #include <grub/ieee1275/ieee1275.h>
 
-/* OpenFirmware entry point passed to us from the real bootloader.  */
 int (*grub_ieee1275_entry_fn) (void *);
 
 grub_ieee1275_phandle_t grub_ieee1275_chosen;
@@ -70,29 +69,7 @@ void cmain (uint32_t r3, uint32_t r4, uint32_t r5);
 void
 cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
 {
-  if (r5 == 0xdeadbeef)
-    {
-      /* Entered from Old World stage1.  */
-      extern char _start;
-      extern char _end;
-
-      grub_ieee1275_entry_fn = (int (*)(void *)) r3;
-
-      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0);
-
-      /* Old World Open Firmware may use 4M-5M without claiming it.  */
-      grub_ieee1275_claim (0x00400000, 0x00100000, 0, 0);
-
-      /* Need to claim ourselves so we don't cannibalize our memory later.  */
-      if (grub_ieee1275_claim ((grub_addr_t) &_start, (grub_addr_t) &_end
-          - (grub_addr_t) &_start, 0, 0))
-       grub_abort ();
-    }
-  else
-    {
-      /* Assume we were entered from Open Firmware.  */
-      grub_ieee1275_entry_fn = (int (*)(void *)) r5;
-    }
+  grub_ieee1275_entry_fn = (int (*)(void *)) r5;
 
   grub_ieee1275_finddevice ("/chosen", &grub_ieee1275_chosen);