svn commit: r213759 - in user/nwhitehorn/ps3: boot/powerpc/ps3 powerpc/conf powerpc/ps3

[Nathan Whitehorn]

Author: nwhitehorn
Date: Wed Oct 13 02:11:59 2010
New Revision: 213759
URL: http://svn.freebsd.org/changeset/base/213759

Log:
  Remove PS3 vestiges of pointless FDT code that never worked anyway, and
  add PS3 to GENERIC64 since it no longer conflicts with POWERMAC.

Modified:
  user/nwhitehorn/ps3/boot/powerpc/ps3/Makefile
  user/nwhitehorn/ps3/boot/powerpc/ps3/main.c
  user/nwhitehorn/ps3/powerpc/conf/GENERIC64
  user/nwhitehorn/ps3/powerpc/ps3/platform_ps3.c

Modified: user/nwhitehorn/ps3/boot/powerpc/ps3/Makefile
==============================================================================
--- user/nwhitehorn/ps3/boot/powerpc/ps3/Makefile	Wed Oct 13 02:10:56 2010	(r213758)
+++ user/nwhitehorn/ps3/boot/powerpc/ps3/Makefile	Wed Oct 13 02:11:59 2010	(r213759)
@@ -21,7 +21,7 @@ LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	yes
-LOADER_FDT_SUPPORT?=	yes
+LOADER_FDT_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
 .if ${LOADER_DISK_SUPPORT} == "yes"

Modified: user/nwhitehorn/ps3/boot/powerpc/ps3/main.c
==============================================================================
--- user/nwhitehorn/ps3/boot/powerpc/ps3/main.c	Wed Oct 13 02:10:56 2010	(r213758)
+++ user/nwhitehorn/ps3/boot/powerpc/ps3/main.c	Wed Oct 13 02:11:59 2010	(r213759)
@@ -101,6 +101,7 @@ main(void)
 	env_setenv("currdev", EV_VOLATILE, "net", ps3_setcurrdev, env_nounset);
 	env_setenv("loaddev", EV_VOLATILE, "net", env_noset, env_nounset);
 	setenv("LINES", "24", 1);
+	setenv("hw.platform", "ps3", 1);
 
 	interact();			/* doesn't return */
 
@@ -204,7 +205,7 @@ ps3_readin(const int fd, vm_offset_t des
 int
 ps3_autoload(void)
 {
-	/* XXX Load PS3 FDT? */
+
 	return (0);
 }
 

Modified: user/nwhitehorn/ps3/powerpc/conf/GENERIC64
==============================================================================
--- user/nwhitehorn/ps3/powerpc/conf/GENERIC64	Wed Oct 13 02:10:56 2010	(r213758)
+++ user/nwhitehorn/ps3/powerpc/conf/GENERIC64	Wed Oct 13 02:11:59 2010	(r213759)
@@ -26,8 +26,9 @@ machine		powerpc	powerpc64
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 # Platform support
-options 	POWERMAC		#NewWorld Apple PowerMacs
 options		MAMBO			#IBM Mambo Full System Simulator
+options 	POWERMAC		#NewWorld Apple PowerMacs
+options		PS3			#Sony PlayStation 3
 
 options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
@@ -126,6 +127,7 @@ device		bge		# Broadcom BCM570xx Gigabit
 device		gem		# Sun GEM/Sun ERI/Apple GMAC
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		glc		# Playstation 3 Ethernet
 
 # Pseudo devices.
 device		loop		# Network loopback

Modified: user/nwhitehorn/ps3/powerpc/ps3/platform_ps3.c
==============================================================================
--- user/nwhitehorn/ps3/powerpc/ps3/platform_ps3.c	Wed Oct 13 02:10:56 2010	(r213758)
+++ user/nwhitehorn/ps3/powerpc/ps3/platform_ps3.c	Wed Oct 13 02:11:59 2010	(r213759)
@@ -49,8 +49,6 @@ __FBSDID("$FreeBSD: user/nwhitehorn/ps3/
 #include <machine/spr.h>
 #include <machine/vmparam.h>
 
-#include <dev/ofw/openfirm.h>
-
 #include "platform_if.h"
 #include "ps3-hvcall.h"
 
@@ -105,22 +103,8 @@ PLATFORM_DEF(ps3_platform);
 static int
 ps3_probe(platform_t plat)
 {
-#if 0
-	phandle_t root;
-	char compatible[64];
-
-	root = OF_finddevice("/");
-
-	if (OF_getprop(root, "compatible", compatible, sizeof(compatible)) <= 0)
-		return (ENXIO);
-
-	if (strncmp(compatible, "sony,ps3", sizeof(compatible)) == 0)
-		return (BUS_PROBE_SPECIFIC);
 
-	return (ENXIO);
-#else
 	return (BUS_PROBE_NOWILDCARD);
-#endif
 }
 
 #define MEM_REGIONS	2