rpms/ppc64-utils/devel ps3.dts, NONE, 1.1 .cvsignore, 1.5, 1.6 ppc64-utils.spec, 1.23, 1.24 sources, 1.10, 1.11

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Apr 8 04:37:26 UTC 2007


Author: dwmw2

Update of /cvs/dist/rpms/ppc64-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14994

Modified Files:
	.cvsignore ppc64-utils.spec sources 
Added Files:
	ps3.dts 
Log Message:
Update kernel bootwrapper


--- NEW FILE ps3.dts ---
/*
 *  PS3 Game Console device tree.
 *
 *  Copyright (C) 2006 Sony Computer Entertainment Inc.
 *  Copyright 2006 Sony Corp.
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; version 2 of the License.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */


/ {
	model = "PS3 Game Console";
	compatible = "PS3";
	#size-cells = <2>;
	#address-cells = <2>;

	/*
	 * Need to keep linux,platform for a while, not used by kernel.
	 */

	chosen {
		linux,platform = <0>;
	};

	/*
	 * Put the RMO here to keep kexec userspace happy.
	 * We'll actually get the size of the bootmem block from lv1 after
	 * startup.
	 */

	memory {
		device_type = "memory";
		reg = <0 0 0 07c00000>;
	};

	/*
	 * dtc expects a clock-frequency and timebase-frequency entries, so
	 * we'll put a null entries here.  These will be initialized after
	 * startup with data from lv1.
	 *
	 * The boot cpu is always zero for PS3.
	 *
	 * Seems the only way currently to indicate a processor has multiple
	 * threads is with an ibm,ppc-interrupt-server#s entry.  We'll put one
	 * here so we can bring up both of ours.  See smp_setup_cpu_maps().
	 */

	cpus {
		#size-cells = <0>;
		#address-cells = <1>;

		CBE,PPE {
			device_type = "cpu";
			reg = <0>;
			ibm,ppc-interrupt-server#s = <0 1>;
			clock-frequency = <0>;
			timebase-frequency = <0>;
			i-cache-size = <8000>;
			d-cache-size = <8000>;
			i-cache-line-size = <80>;
			d-cache-line-size = <80>;
		};
	};
};


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Mar 2007 03:26:54 -0000	1.5
+++ .cvsignore	8 Apr 2007 04:37:24 -0000	1.6
@@ -6,3 +6,5 @@
 powerpc-utils-1.0.3.tar.gz
 powerpc-utils-papr-1.0.3.tar.gz
 ps3pf_utils-1.0.9.tar.bz2
+zImage-wrapper.tar.gz
+ps3.dtb


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ppc64-utils.spec	31 Mar 2007 03:26:54 -0000	1.23
+++ ppc64-utils.spec	8 Apr 2007 04:37:24 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL and OSL
 Group: System Environment/Base
 Source0: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-%{powerpcutilsver}.tar.gz
@@ -16,6 +16,9 @@
 Source6: zImage-boot.tar.gz
 Source7: http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-%{powerpcutilsver}.tar.gz
 Source8: http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3pf_utils-%{ps3pfutilsver}.tar.bz2
+Source9: zImage-wrapper.tar.gz
+Source10: ps3.dts
+Source11: ps3.dtb
 Patch0: pmac-utils-0.4-cell.patch
 Patch1: ppc64-utils-1.1-64k.patch
 Patch2: ps3pf_utils-1.0.9-types.patch
@@ -34,7 +37,7 @@
 A collection of utilities for Linux on PPC64 platforms.
 
 %prep
-%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8
+%setup -n powerpc-utils-%{powerpcutilsver} -a 5 -a 6 -a 7 -a 8 -a 9
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 %patch0 -p0 -b .cell
 %patch1 -p1 -b .64k
@@ -47,7 +50,10 @@
 make -C pmac-utils-%{pmacutilsver} clean nvsetenv nvsetenv.8
 CFLAGS="$RPM_OPT_FLAGS" make -C powerpc-utils-papr-%{powerpcutilsver}
 make -C zImage-boot zImage.stub
+make -C zImage-wrapper CFLAGS="$RPM_OPT_FLAGS"
 make -C ps3pf_utils-%{ps3pfutilsver}
+# After Core/Extras merge, we can require dtc and...
+# dtc -O dtb %{SOURCE10} -o ps3.dtb
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +76,9 @@
 rm -rf $RPM_BUILD_ROOT/etc/init.d
 install -m 644 scripts/ibmvscsis.sh $RPM_BUILD_ROOT/usr/share/ppc64-utils
 popd
+make -C zImage-wrapper DESTDIR=$RPM_BUILD_ROOT install
 make -C ps3pf_utils-%{ps3pfutilsver} DESTDIR=$RPM_BUILD_ROOT install
+install -m0644 %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT/usr/share/ppc64-utils/wrapper
 rm -rf $RPM_BUILD_ROOT/%{_docdir}/packages
 
 %clean
@@ -86,6 +94,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Sun Apr  8 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-3
+- Update kernel bootwrapper magic
+
 * Sat Mar 31 2007 David Woodhouse <dwmw2 at redhat.com> - 0.11-2
 - Include ps3pf_utils.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	31 Mar 2007 03:26:54 -0000	1.10
+++ sources	8 Apr 2007 04:37:24 -0000	1.11
@@ -3,3 +3,5 @@
 ffd031d0b949bef79a57159ecc235d3f  powerpc-utils-1.0.3.tar.gz
 19ae37d109ccafa4feeb714925b022b1  powerpc-utils-papr-1.0.3.tar.gz
 0a7cccf1de3287e669898e3f41cddf3e  ps3pf_utils-1.0.9.tar.bz2
+527d2fbc16951d5ff44c7aec5bc0e6f5  zImage-wrapper.tar.gz
+787839c782f8ab9812903cfb501455c8  ps3.dtb




More information about the fedora-cvs-commits mailing list