[Debootloaders-devel] r44 - trunk/yaboot/ybin

[Aurélien GÉRÔME]

Author: ag-guest
Date: 2006-07-10 22:21:58 +0000 (Mon, 10 Jul 2006)
New Revision: 44

Modified:
   trunk/yaboot/ybin/ofpath
Log:
Merge Colin's Pegasos patches.


Modified: trunk/yaboot/ybin/ofpath
===================================================================
--- trunk/yaboot/ybin/ofpath	2006-07-10 22:19:46 UTC (rev 43)
+++ trunk/yaboot/ybin/ofpath	2006-07-10 22:21:58 UTC (rev 44)
@@ -396,6 +396,10 @@
 		local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
 		local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
 		;;
+	    spi)
+		local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
+		local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
+		;;
 	    *)
 		echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
 		return 1
@@ -906,6 +910,8 @@
     SUBARCH=OldWorld
 elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
     SUBARCH=CHRP
+elif (cat /proc/cpuinfo 2>/dev/null | grep ^machine | grep -q 'CHRP Pegasos') ; then
+    SUBARCH=Pegasos
 else
     echo 1>&2 "$PRG: This machine is not yet supported"
     exit 1
@@ -928,7 +934,8 @@
 
 ## use appropriate search for right sub arch.
 case "$SUBARCH" in
-    NewWorld)
+    # Pegasos OF seems to be NewWorld-ish enough to cope with this.
+    NewWorld|Pegasos)
 	newworld || exit 1
 	;;
     OldWorld)