summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavoz@gentoo.org>2005-06-28 19:56:12 +0000
committerGustavo Zacarias <gustavoz@gentoo.org>2005-06-28 19:56:12 +0000
commitb11f080e6159264a011a3bdcb155ee78ee5b3b34 (patch)
treeb8d7a11cad5db7a68263d07ab3d03310de146084
parentMarked ppc stable for bug #97332. (diff)
downloadgentoo-2-b11f080e6159264a011a3bdcb155ee78ee5b3b34.tar.gz
gentoo-2-b11f080e6159264a011a3bdcb155ee78ee5b3b34.tar.bz2
gentoo-2-b11f080e6159264a011a3bdcb155ee78ee5b3b34.zip
Bump with fixed and new device support
(Portage version: 2.0.51.19)
-rw-r--r--dev-embedded/uisp/ChangeLog9
-rw-r--r--dev-embedded/uisp/Manifest21
-rw-r--r--dev-embedded/uisp/files/digest-uisp-20050207-r1 (renamed from dev-embedded/uisp/files/digest-uisp-20050207)0
-rw-r--r--dev-embedded/uisp/files/mega-48-88-168.patch41
-rw-r--r--dev-embedded/uisp/uisp-20050207-r1.ebuild (renamed from dev-embedded/uisp/uisp-20050207.ebuild)8
5 files changed, 62 insertions, 17 deletions
diff --git a/dev-embedded/uisp/ChangeLog b/dev-embedded/uisp/ChangeLog
index c119984d9dc0..fdf483f73e24 100644
--- a/dev-embedded/uisp/ChangeLog
+++ b/dev-embedded/uisp/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-embedded/uisp
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/ChangeLog,v 1.10 2005/06/10 14:36:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/ChangeLog,v 1.11 2005/06/28 19:56:12 gustavoz Exp $
+
+*uisp-20050207-r1 (28 Jun 2005)
+
+ 28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+ +files/mega-48-88-168.patch, -uisp-20050207.ebuild,
+ +uisp-20050207-r1.ebuild:
+ Bump with fixed and new device support
*uisp-20050207 (10 Jun 2005)
diff --git a/dev-embedded/uisp/Manifest b/dev-embedded/uisp/Manifest
index db18a9f6b018..94b8989751e9 100644
--- a/dev-embedded/uisp/Manifest
+++ b/dev-embedded/uisp/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 9355527679c137813d4b060bfb1c5cb7 uisp-20050103.ebuild 1183
MD5 548e48d64c6672cedd597495ccde9ac2 uisp-20040311.ebuild 720
+MD5 84c4da9330405312d935616d27c6c0f1 ChangeLog 1626
MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
-MD5 6bb722afe770786634286ecd121d175b ChangeLog 1415
-MD5 9355527679c137813d4b060bfb1c5cb7 uisp-20050103.ebuild 1183
-MD5 f53ccd55f92feeec8d9776268428d975 uisp-20050207.ebuild 746
-MD5 6f0f59ddc224f11f17c41296c3311fc7 files/digest-uisp-20050207 65
+MD5 7ef77e401a311d62f6de7591878f8d77 uisp-20050207-r1.ebuild 729
+MD5 b286026a1895b223efeb016c526bc59b files/uisp-gcc34.patch 239
+MD5 6f0f59ddc224f11f17c41296c3311fc7 files/digest-uisp-20050207-r1 65
+MD5 6d263eb659745bf52372bb182f885bdd files/mega-48-88-168.patch 2426
MD5 340231b36e7605c3932670c55256a850 files/digest-uisp-20040311 66
MD5 43d51e70f4081f26b45f71d513c757f8 files/digest-uisp-20050103 65
-MD5 b286026a1895b223efeb016c526bc59b files/uisp-gcc34.patch 239
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCqaWCKRy60XGEcJIRAqCUAJ9g9gKSduwi65pa2DyXOWq2nAPgUQCeI78q
-umKS98BzimOGXNykLk+Ts4g=
-=6rx1
------END PGP SIGNATURE-----
diff --git a/dev-embedded/uisp/files/digest-uisp-20050207 b/dev-embedded/uisp/files/digest-uisp-20050207-r1
index 6f394cead2fe..6f394cead2fe 100644
--- a/dev-embedded/uisp/files/digest-uisp-20050207
+++ b/dev-embedded/uisp/files/digest-uisp-20050207-r1
diff --git a/dev-embedded/uisp/files/mega-48-88-168.patch b/dev-embedded/uisp/files/mega-48-88-168.patch
new file mode 100644
index 000000000000..730078bb9845
--- /dev/null
+++ b/dev-embedded/uisp/files/mega-48-88-168.patch
@@ -0,0 +1,41 @@
+diff -Nura uisp-20050207/src/Avr.C uisp-20050207-mega-48-88-168/src/Avr.C
+--- uisp-20050207/src/Avr.C 2005-02-07 19:55:08.000000000 -0300
++++ uisp-20050207-mega-48-88-168/src/Avr.C 2005-06-28 16:37:58.000000000 -0300
+@@ -77,7 +77,7 @@
+ /* no longer in production? -> use 8515, 8535 instead */
+ { "AT90S4414", 0x92, 0x01, 4096, 0, 256, 4000, 4000, AVR_2313 },
+ { "AT90S4434", 0x92, 0x02, 4096, 0, 256, 4000, 4000, AVR_8535 },
+- { "ATmega48", 0x92, 0x05, 4096, 0, 256, 4000, 4000, AVR_M163 },
++ { "ATmega48", 0x92, 0x05, 4096, 32, 256, 2000, 1500, AVR_M48 },
+
+ { "AT90S8515", 0x93, 0x01, 8192, 0, 512, 4000, 4000, AVR_2313 },
+ { "AT90S8535", 0x93, 0x03, 8192, 0, 512, 4000, 4000, AVR_8535 },
+@@ -90,7 +90,7 @@
+ { "ATmega8515", 0x93, 0x06, 8192, 64, 512, 4500, 9000, AVR_M163 },
+ { "ATmega8", 0x93, 0x07, 8192, 64, 512, 4500, 9000, AVR_M163 },
+ { "ATmega8535", 0x93, 0x08, 8192, 64, 512, 4500, 9000, AVR_M163 },
+- { "ATmega88", 0x93, 0x0a, 8192, 64, 512, 4000, 4000, AVR_M163 },
++ { "ATmega88", 0x93, 0x0a, 8192, 64, 512, 2000, 1500, AVR_M163 },
+
+ #if 0
+ /* 12V parallel programming only; here just for the evidence */
+@@ -101,6 +101,7 @@
+ { "ATmega163", 0x94, 0x02, 16384, 128, 512, 15000, 3800, AVR_M163 },
+ { "ATmega16", 0x94, 0x03, 16384, 128, 512, 4500, 9000, AVR_M163 },
+ { "ATmega162", 0x94, 0x04, 16384, 128, 512, 4500, 9000, AVR_M128 },
++ { "ATmega168", 0x94, 0x06, 16384, 128, 512, 2000, 1500, AVR_M163 },
+ { "ATmega169", 0x94, 0x05, 16384, 128, 512, 4500, 9000, AVR_M128 },
+
+ { "ATmega323", 0x95, 0x01, 32768, 128, 1024, 15000, 3800, AVR_M163 },
+diff -Nura uisp-20050207/src/Avr.h uisp-20050207-mega-48-88-168/src/Avr.h
+--- uisp-20050207/src/Avr.h 2004-03-30 23:25:44.000000000 -0300
++++ uisp-20050207-mega-48-88-168/src/Avr.h 2005-06-28 16:41:24.000000000 -0300
+@@ -121,6 +121,8 @@
+ | AVR_FUSE_NEWWR | AVR_CAL_RD | AVR_FUSE_HIGH)
+ #define AVR_M128 (AVR_BYTE_POLL | AVR_PAGE_POLL | AVR_LOCK_BOOT | AVR_FUSE_RD \
+ | AVR_FUSE_NEWWR | AVR_CAL_RD | AVR_FUSE_HIGH | AVR_FUSE_EXT)
++#define AVR_M48 (AVR_BYTE_POLL | AVR_PAGE_POLL | AVR_FUSE_RD | AVR_FUSE_NEWWR \
++ | AVR_CAL_RD | AVR_FUSE_HIGH)
+
+ /* XXX no boot lock bits, but ordinary lock bits are in bits 1 and 0.
+ XXX has 4 calibration bytes for 1/2/4/8 MHz, can only read one for now. */
diff --git a/dev-embedded/uisp/uisp-20050207.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
index 5a5a66702e32..54a3f53ce97f 100644
--- a/dev-embedded/uisp/uisp-20050207.ebuild
+++ b/dev-embedded/uisp/uisp-20050207-r1.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/dev-embedded/uisp/uisp-20050207.ebuild,v 1.1 2005/06/10 14:36:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/uisp/uisp-20050207-r1.ebuild,v 1.1 2005/06/28 19:56:12 gustavoz Exp $
inherit eutils
@@ -17,6 +17,12 @@ DEPEND="sys-apps/gawk
sys-devel/gcc"
RDEPEND=""
+src_unpack() {
+ unpack ${A}
+ cd ${S}/src
+ epatch ${FILESDIR}/mega-48-88-168.patch
+}
+
src_compile() {
econf || die "configure failed"
emake || die "make failed"