From owner-svn-src-user@FreeBSD.ORG Wed Oct 13 02:11:59 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBF7D106579D; Wed, 13 Oct 2010 02:11:59 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D9BEB8FC16; Wed, 13 Oct 2010 02:11:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9D2Bx5j069266; Wed, 13 Oct 2010 02:11:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9D2BxuY069261; Wed, 13 Oct 2010 02:11:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201010130211.o9D2BxuY069261@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 13 Oct 2010 02:11:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213759 - in user/nwhitehorn/ps3: boot/powerpc/ps3 powerpc/conf powerpc/ps3 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2010 02:12:00 -0000 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 #include -#include - #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