diff options
| author |   Gustavo Zacarias <gustavoz@gentoo.org> | 2005-03-06 19:21:57 +0000 |
|---|---|---|
| committer | Gustavo Zacarias <gustavoz@gentoo.org> | 2005-03-06 19:21:57 +0000 |
| commit | 4f2db27edb1b490579952419fc17bcc64db251de (patch) | |
| tree | bf1cf7ae354feb5c167477bdcd3140825d0fa180 | |
| parent | Manifest recommit (diff) | |
| download | historical-4f2db27edb1b490579952419fc17bcc64db251de.tar.gz historical-4f2db27edb1b490579952419fc17bcc64db251de.tar.bz2 historical-4f2db27edb1b490579952419fc17bcc64db251de.zip | |
Added blade 1500 support patch from davem
Package-Manager: portage-2.0.51.19
| -rw-r--r-- | sys-kernel/sparc-sources/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/sparc-sources/Manifest | 11 | ||||
| -rw-r--r-- | sys-kernel/sparc-sources/files/blade1500.patch | 43 | ||||
| -rw-r--r-- | sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild | 5 |
4 files changed, 57 insertions, 8 deletions
diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog index 38a525923ba5..6363342e2ddf 100644 --- a/sys-kernel/sparc-sources/ChangeLog +++ b/sys-kernel/sparc-sources/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/sparc-sources # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.80 2005/02/25 02:15:23 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.81 2005/03/06 19:21:57 gustavoz Exp $ + + 06 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> +files/blade1500.patch, + sparc-sources-2.4.29.ebuild: + Added blade 1500 support patch from davem 24 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> +files/2.4-sparc64-ramdisk64.patch, sparc-sources-2.4.29.ebuild: diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest index 281a42b4a39d..72d1426ddb38 100644 --- a/sys-kernel/sparc-sources/Manifest +++ b/sys-kernel/sparc-sources/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 10909dd2e2aa9b684e9c4c14401f6d92 ChangeLog 13665 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381 -MD5 e8d5390bc6f5a4fdd68231c98b50bec2 sparc-sources-2.4.29.ebuild 1239 +MD5 5240b7bb30f419092ac0cee0d7f683a4 ChangeLog 13819 +MD5 dec627b47037855f96900fe9c20f28ae sparc-sources-2.4.29.ebuild 1268 MD5 0cae39dcfb06422e094da7e364e67c33 files/2.4-sparc64-ramdisk64.patch 2558 +MD5 ac8d8bb55e33fd4113aaecc98591f533 files/blade1500.patch 1480 MD5 18898e8c936c287f66f4f234a997f93e files/digest-sparc-sources-2.4.29 140 MD5 387e70ce7c98618810dea0f521df76eb files/generate-asm-sparc 1661 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFCHopDKRy60XGEcJIRAqXrAKCTRhpzI/JegPGL9JTuM+C6rrFvfwCeN7iS -coCZ6EycKrBM1xSg2ovUYfs= -=ucPO +iD8DBQFCK1hwKRy60XGEcJIRApp5AJ9vCxSDWRdCIaiRVDgxNxGJSsdSHwCgotD2 +i7GWjfZr03X01oMQG6pCFZk= +=ye2J -----END PGP SIGNATURE----- diff --git a/sys-kernel/sparc-sources/files/blade1500.patch b/sys-kernel/sparc-sources/files/blade1500.patch new file mode 100644 index 000000000000..7cd6c0317c98 --- /dev/null +++ b/sys-kernel/sparc-sources/files/blade1500.patch @@ -0,0 +1,43 @@ +# This is a BitKeeper generated diff -Nru style patch. +# +# ChangeSet +# 2005/03/02 14:12:47-08:00 davem@nuts.davemloft.net +# [SPARC64]: Accept 'm5823' clock chip as seen on SB1500. +# +# Signed-off-by: David S. Miller <davem@davemloft.net> +# +# arch/sparc64/kernel/time.c +# 2005/03/02 14:12:26-08:00 davem@nuts.davemloft.net +5 -2 +# [SPARC64]: Accept 'm5823' clock chip as seen on SB1500. +# +diff -Nru a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c +--- a/arch/sparc64/kernel/time.c 2005-03-02 14:13:06 -08:00 ++++ b/arch/sparc64/kernel/time.c 2005-03-02 14:13:06 -08:00 +@@ -770,6 +770,7 @@ + strcmp(model, "mk48t59") && + strcmp(model, "m5819") && + strcmp(model, "m5819p") && ++ strcmp(model, "m5823") && + strcmp(model, "ds1287")) { + if (cbus != NULL) { + prom_printf("clock_probe: Central bus lacks timer chip.\n"); +@@ -829,7 +830,8 @@ + + if (!strcmp(model, "ds1287") || + !strcmp(model, "m5819") || +- !strcmp(model, "m5819p")) { ++ !strcmp(model, "m5819p") || ++ !strcmp(model, "m5823")) { + ds1287_regs = edev->resource[0].start; + } else { + mstk48t59_regs = edev->resource[0].start; +@@ -850,7 +852,8 @@ + } + if (!strcmp(model, "ds1287") || + !strcmp(model, "m5819") || +- !strcmp(model, "m5819p")) { ++ !strcmp(model, "m5819p") || ++ !strcmp(model, "m5823")) { + ds1287_regs = isadev->resource.start; + } else { + mstk48t59_regs = isadev->resource.start; diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild index b6ef6b17123a..749564168c9a 100644 --- a/sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild +++ b/sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild,v 1.3 2005/02/25 02:15:23 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild,v 1.4 2005/03/06 19:21:57 gustavoz Exp $ ETYPE="sources" IUSE="livecd ultra1" @@ -14,7 +14,8 @@ SSV_URI="mirror://gentoo/patches-${PATCH_BASE}.tar.bz2" KEYWORDS="-* sparc" DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel" UNIPATCH_LIST="${DISTDIR}/patches-${PATCH_BASE}.tar.bz2 - ${FILESDIR}/2.4-sparc64-ramdisk64.patch" + ${FILESDIR}/2.4-sparc64-ramdisk64.patch + ${FILESDIR}/blade1500.patch" SRC_URI="${KERNEL_URI} ${SSV_URI}" HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org" |