summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavoz@gentoo.org>2005-03-06 19:21:57 +0000
committerGustavo Zacarias <gustavoz@gentoo.org>2005-03-06 19:21:57 +0000
commit6161704f67f7b5c572faceb359b5bc4c0a71840e (patch)
tree97d0d5593a85a59f3995226385c2a3053f417606 /sys-kernel
parentManifest recommit (diff)
downloadgentoo-2-6161704f67f7b5c572faceb359b5bc4c0a71840e.tar.gz
gentoo-2-6161704f67f7b5c572faceb359b5bc4c0a71840e.tar.bz2
gentoo-2-6161704f67f7b5c572faceb359b5bc4c0a71840e.zip
Added blade 1500 support patch from davem
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/sparc-sources/ChangeLog6
-rw-r--r--sys-kernel/sparc-sources/files/blade1500.patch43
-rw-r--r--sys-kernel/sparc-sources/sparc-sources-2.4.29.ebuild5
3 files changed, 51 insertions, 3 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/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"