diff options
author | Tim Harder <radhermit@gentoo.org> | 2012-05-25 07:44:17 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2012-05-25 07:44:17 +0000 |
commit | fc246f95d5e7e36cc5a5bb49bc58c9f6d362e1cf (patch) | |
tree | eadce25b160d6a26804acf548560c5575d55c1c5 /dev-embedded/avrdude | |
parent | Initial import, needed as dependency of sci-electronics/gnetman (diff) | |
download | historical-fc246f95d5e7e36cc5a5bb49bc58c9f6d362e1cf.tar.gz historical-fc246f95d5e7e36cc5a5bb49bc58c9f6d362e1cf.tar.bz2 historical-fc246f95d5e7e36cc5a5bb49bc58c9f6d362e1cf.zip |
Remove old.
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'dev-embedded/avrdude')
-rw-r--r-- | dev-embedded/avrdude/ChangeLog | 8 | ||||
-rw-r--r-- | dev-embedded/avrdude/Manifest | 31 | ||||
-rw-r--r-- | dev-embedded/avrdude/avrdude-5.10.ebuild | 49 | ||||
-rw-r--r-- | dev-embedded/avrdude/avrdude-5.11.ebuild | 44 | ||||
-rw-r--r-- | dev-embedded/avrdude/avrdude-5.8-r1.ebuild | 48 | ||||
-rw-r--r-- | dev-embedded/avrdude/avrdude-5.8.ebuild | 45 | ||||
-rw-r--r-- | dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch | 22 | ||||
-rw-r--r-- | dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch | 16 |
8 files changed, 15 insertions, 248 deletions
diff --git a/dev-embedded/avrdude/ChangeLog b/dev-embedded/avrdude/ChangeLog index 3d79079d5691..ba64f895caae 100644 --- a/dev-embedded/avrdude/ChangeLog +++ b/dev-embedded/avrdude/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-embedded/avrdude # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.51 2012/05/25 07:40:13 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.52 2012/05/25 07:44:17 radhermit Exp $ + + 25 May 2012; Tim Harder <radhermit@gentoo.org> -avrdude-5.8.ebuild, + -avrdude-5.8-r1.ebuild, -files/avrdude-5.8-dragon-segfault.patch, + -avrdude-5.10.ebuild, -files/avrdude-5.10-jtagmkII-debugWire.patch, + -avrdude-5.11.ebuild: + Remove old. 25 May 2012; Tim Harder <radhermit@gentoo.org> avrdude-5.11.1.ebuild: Bump libusb slot dep. diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest index bd7b1825f23f..9721937469c0 100644 --- a/dev-embedded/avrdude/Manifest +++ b/dev-embedded/avrdude/Manifest @@ -1,41 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX avrdude-5.10-jtagmkII-debugWire.patch 684 RMD160 3f240926fe81dfcced0ef9729b63b48834e4bc96 SHA1 6a645a801729a3d2620ff6804d9d9e2e255f9068 SHA256 41ec2f15817917925e07da715672331426c36142de8f8ff8a3e2680f39c3f65d -AUX avrdude-5.8-dragon-segfault.patch 543 RMD160 14bedadae5a52214d41565874d8bd394f9e73a8d SHA1 06d0bbf34371bc1077cbea54dabe431098b22dfa SHA256 66c2a29f55eb1b897b4e48c3b3c6b0511502dda07322c8b4006d9d56f5618e19 -DIST avrdude-5.10.tar.gz 525750 RMD160 38ce9407a33bf4a4c656651071b44a92fdbdd639 SHA1 c09167ea64c3f60b594d0e4da71af7edea0d6f83 SHA256 81501b63d5b8699874d00c9eca42837b85695bc0820ba9843b17f573ce38be5e DIST avrdude-5.11.1.tar.gz 570880 RMD160 8d5e0d9a8642aee63b505dc4e9090fb50c5a4d2d SHA1 330b3a38d3de6c54d4866819ffb6924ed3728173 SHA256 52cd4586ec28e892407ae09e81bb8e719df08ee79acd88e5110fa890c82cec90 -DIST avrdude-5.11.tar.gz 549113 RMD160 a91777fd81c0ab8275c96db2b390d62607bd5383 SHA1 3427bf7df61e2b09c0fa33085da796ed5e9698e3 SHA256 6317f4f30fcb1baf7e07e55e5c743af3e1e7f949f206d3872a622aed31d595d7 DIST avrdude-5.4.tar.gz 429687 RMD160 26af286bc4d4b9704eabdc371daf97b438b25a26 SHA1 45642d4e74cfb4a6edc6d0d769d8d9b2e7a846ed SHA256 bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30 DIST avrdude-5.5.tar.gz 453614 RMD160 29d7a3f86172e156c744747856c4c581dd78e62d SHA1 a97a5f520e6c1504d39cd77ebd72a367ac0f5e95 SHA256 4081053eab5475c7dc782ae6322fecb76582951319af432da110e3839e7b4b51 -DIST avrdude-5.8.tar.gz 488771 RMD160 c8eb0675f84477d6b58f0e8dc0438e16ac0714db SHA1 77198df91a7176bbdab19ef4a4caf0bdc5862c94 SHA256 ff9a5b13c45ebf95cc4b77a0790463a0ebefbe1c76d89ff8cfa9520461f9d046 -DIST avrdude-doc-5.10.pdf 231216 RMD160 f8152450d385d521007c29341766eed4eef8d6c6 SHA1 0c288ccdc2730dabacc1c494a9e38ea698183a48 SHA256 49ed5cb00a001844cf6eccf9444ad8fa268bdbef8f11760e8d0c015b5cd93b70 -DIST avrdude-doc-5.10.tar.gz 33742 RMD160 feb3795e0d3ac9eadce1ff27c36b34aac9250595 SHA1 c2089f2b84bb2f40dd8b1364bb89e667c894fd9b SHA256 dfd443ad5376676881d0cd73582aab6a83c2658cf3c300fb217b4a3d06424df5 DIST avrdude-doc-5.11.1.pdf 242953 RMD160 aacc5e0ed735dbec22a6295d14f9c0f99cac81da SHA1 369f7be9ccd2b77cf70c5eaccf3f12d6a1450461 SHA256 2f017acf39bb64256f424671b0a839b2d7544639d1a57702d5de2cb4d534ed1d DIST avrdude-doc-5.11.1.tar.gz 35915 RMD160 4edb399fed7d66decf25995ac3d0d6f65cca9b73 SHA1 8f882f1563fa12e6c5944e3631e41846aedc9690 SHA256 62b645282bd87ffedeac4b94b15fb868dfbadfaa4a63373a25ede9c7c53d4217 -DIST avrdude-doc-5.11.pdf 236872 RMD160 1f1266221290cf655a91e92bbc25f27ab51b2fc2 SHA1 9fd2d64e1b71fdc67cbf57fe5e8c674a97036fe6 SHA256 ee69853a09ef30b3d5db256bc690d3ea5a787b342356c0d382152b2c16cd12d3 -DIST avrdude-doc-5.11.tar.gz 35807 RMD160 1199fa547c87a91fb95af171f4e6c936a6db2e5d SHA1 b363533b821d11a2f68a6e5595d8ce0fc170ecf5 SHA256 61e503da2d81ef9a3632d769b95ac6fea2a084af07f9d24d78e2eb17edc21e54 DIST avrdude-doc-5.5.pdf 199919 RMD160 425226e8629e4e5c20987bc389f087d669e6f8a4 SHA1 b6a5a41dc6a6cdbc590db0e5e40ba3d0cb35a46d SHA256 851c462b9f560be63238befb0dbf4bdb2b0f11b9d272c2e0d7f06e63e37cd27a DIST avrdude-doc-5.5.tar.gz 26256 RMD160 6c5b298eaffceb78f3eb6d68ff9a70d37e6bc096 SHA1 a06a06852cdcf1ebe67efcd2584953f1bbe8d62b SHA256 26d7883172eb8c55604a7561270aa2ac7ec4760d8dfbb44087eaede35688ac5c -DIST avrdude-doc-5.8.pdf 214889 RMD160 25447cf70e2ad4743ceffc195832044cc65f0c6a SHA1 7db074bb392a81adc24e9c60372532b16e94224c SHA256 da08527e1c3ed3baab772dfb3dd2a075af9916c5471c4584dec1fd5642aed355 -DIST avrdude-doc-5.8.tar.gz 30219 RMD160 6f8199af786d1e4d0f2ed8ee6ed18e4153592b61 SHA1 c1cd604ddb34ac252bc42741cd63638902a6bd01 SHA256 5246f55cdb1c0e056fe6f8fdc0c6004bcd4430178d3fabec886a656881a7bdb3 -EBUILD avrdude-5.10.ebuild 1356 RMD160 07236bd583900c9cd2efd05bd3b500a62683e6d4 SHA1 613ad11443d270818d340231cfd079a440430bd6 SHA256 f5c5057c0ce2dbca5c0b024808ff09e4403eeb7a0ee15dde30ce84381d43ccb6 EBUILD avrdude-5.11.1.ebuild 1439 RMD160 d3ea6f2e8b82e312317aba127c73343cdf27bf30 SHA1 0288dcda1dbc399a97086c4c14b1798a5be06b59 SHA256 f98e643e68d92e9a976aa1371311d067c028364398333c953af865358f57b794 -EBUILD avrdude-5.11.ebuild 1108 RMD160 7c7994255d87c1ef6adafc25ed81ae594669dc0d SHA1 af7ac799001248a89ca9abe6ead0373c63e0b22e SHA256 733d7b1953b90897f37a8a3e095b3e1e3de02664876c5dce505ac4a650881422 EBUILD avrdude-5.4.ebuild 1070 RMD160 e7c0669af7892454be9c2a55c70005648e887bbf SHA1 28b045d6c8736353a859150eddfbcf14b32407ae SHA256 ee93f8c6b91ede8ddaf7eb5975e4d38fa70a13c4797e46ed36792253ed0416c6 EBUILD avrdude-5.5.ebuild 1573 RMD160 4baac79096a40136124a31f974373b97e407399f SHA1 4aadc9719b1d5c7b34de56dd1d73eced14f9c2b9 SHA256 f4f3d6e28deb48a0574697d992cd60d4a466c1261791bab0d07bd96425d66a92 -EBUILD avrdude-5.8-r1.ebuild 1361 RMD160 acf05b2455ce8612db10ac3d4725298440f3af8b SHA1 ab9f0d5b811c40c597028ea66d7bba7ec4f05b2d SHA256 d2f04ba83cdbfcaec67f5b767f6c28fa78926fc1e61677e223272092b2599812 -EBUILD avrdude-5.8.ebuild 1286 RMD160 2c9b84ab6802eaa96bd0c1c509f578933711adfb SHA1 bd2d936b174ffe5ef5a7a55302ec15e91e0a48cf SHA256 965c7223ad1979c4cb0d6f2b7c9c08996863007d7dbd8276fde7bb453f47f1a1 -MISC ChangeLog 6787 RMD160 98cef64af0a85aa8184de36d1b19cb44a6632efd SHA1 5ada823de34d48a28b062d45e631ab728890373c SHA256 3366ac2a819072591a613968c055bf576d3d7c56db2c48357d00071dbd02dabf +MISC ChangeLog 7034 RMD160 77d527b8442f50602650f9a30682560c3e0bb1b9 SHA1 6a46778c7c7a7fd31b06018ae2f1241fa12f119a SHA256 169f3bfddb17603a7bb7d57058e2e71e402d12ab0263f19599a92bd8aac07f8c MISC metadata.xml 275 RMD160 5b5d385d1f08cf5ea3a0fd5333d96afda1295cab SHA1 f3284ea17073203ce2ab705457eea52fb7d7439a SHA256 91057bf8ca0ae82be5f25c0aade58e74f5c4cb8db73654ccaa8beddeb3a753fa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCgAGBQJPvzdmAAoJEEqz6FtPBkyjoqoH+wU4AM4T4cZ039F7Sc7kl5aX -9C/YpSiu4lvDwmVa1zcvfIurcBGOAF+0PMjJ+VTVy7vCD7VfCn3ibkROVBhpdkyO -VyYHNRChIH3gbrSZY8NMU3+b+Vr4reX0s0g3fmsteoUVnUT+Ul3Esyl2rZG/RZ5K -4VG9SePxdIs7YkntspRLnO3GnXi/0CxANNIZW3SvpnFXsH5uj0mhFqHZH/9QiCtx -V09CZGoQuLKVtYzynrICRjZ1GmrHOkFO6MTY5RBM15BjW+xllE3ieo3ADRJPXFAp -oBO8Y4BuiqEqXuAAoMSs+183QcHpFDei3PaASgGVbiRZ3rxhm9e61gdt91Hk6DY= -=/IGl +iQEcBAEBCgAGBQJPvzhWAAoJEEqz6FtPBkyjLbQIAKHsnYs9CM/o5S5gR54eecm+ +M71K9hUqWAKM997vR9Lq/DiNcHdbPJP1Ejk3GJUfPwnX/r2aa/r3nLzl2I4Oz0T3 +wGVBDzaypFeP3gHFGUP4CZ1uMDJUpDPZmmucIrAU5QAqgrDOBN5ZzWlSXx5pN2uc +Ht1kvAhYYWMBvCcqA01O6dsQNYcQ4Pi3NrUzqKdYcUi1XidNsnL9fJQCGitJMNI4 +GRW4I1WyHuq4qY1flsfIFoETGAiBFl6CWvAWrR6+pABMaubwxDq/S3PWVE03UQq0 +CLNAw8LkD7r/WP7JMFp9McFshSsB4vyUw0kYlWPW+/9uziaf0XKiTt/VxAKw364= +=JfbF -----END PGP SIGNATURE----- diff --git a/dev-embedded/avrdude/avrdude-5.10.ebuild b/dev-embedded/avrdude/avrdude-5.10.ebuild deleted file mode 100644 index bd3c6b5320a5..000000000000 --- a/dev-embedded/avrdude/avrdude-5.10.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.10.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="AVR Downloader/UploaDEr" -HOMEPAGE="http://savannah.nongnu.org/projects/avrdude" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz - doc? ( - mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz - mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc" - -RDEPEND="virtual/libusb:0" -DEPEND="${RDEPEND}" - -src_prepare() { - # let the build system re-generate these, bug #120194 - rm -f lexer.c config_gram.c config_gram.h - - epatch "${FILESDIR}/${P}-jtagmkII-debugWire.patch" -} - -src_compile() { - # The automake target for these files does not use tempfiles or create these - # atomically, confusing a parallel build. So we force them first. - emake lexer.c config_gram.c config_gram.h || die "emake of lexer failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog* NEWS README || die "dodoc failed" - - if use doc ; then - newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf || \ - die "newdoc failed" - dohtml -r "${WORKDIR}/avrdude-html/" || die "dohtml failed" - fi -} diff --git a/dev-embedded/avrdude/avrdude-5.11.ebuild b/dev-embedded/avrdude/avrdude-5.11.ebuild deleted file mode 100644 index e538ef8a4f44..000000000000 --- a/dev-embedded/avrdude/avrdude-5.11.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.11.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $ - -EAPI=4 - -DESCRIPTION="AVR Downloader/UploaDEr" -HOMEPAGE="http://savannah.nongnu.org/projects/avrdude" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz - doc? ( - mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz - mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc" - -RDEPEND="virtual/libusb" -DEPEND="${RDEPEND}" - -DOCS="AUTHORS ChangeLog* NEWS README" - -src_prepare() { - # let the build system re-generate these, bug #120194 - rm -f lexer.c config_gram.c config_gram.h -} - -src_compile() { - # The automake target for these files does not use tempfiles or create - # these atomically, confusing a parallel build. So we force them first. - emake lexer.c config_gram.c config_gram.h - emake -} - -src_install() { - default - - if use doc ; then - newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf - dohtml -r "${WORKDIR}/avrdude-html/" - fi -} diff --git a/dev-embedded/avrdude/avrdude-5.8-r1.ebuild b/dev-embedded/avrdude/avrdude-5.8-r1.ebuild deleted file mode 100644 index 1947f1a606f8..000000000000 --- a/dev-embedded/avrdude/avrdude-5.8-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8-r1.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="AVR Downloader/UploaDEr" -HOMEPAGE="http://savannah.nongnu.org/projects/avrdude" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz - doc? ( - mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz - mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc" - -RDEPEND="virtual/libusb:0" -DEPEND="${RDEPEND}" - -src_prepare() { - # let the build system re-generate these, bug #120194 - rm -f lexer.c config_gram.c config_gram.h - epatch "${FILESDIR}"/avrdude-5.8-dragon-segfault.patch -} - -src_compile() { - # The automake target for these files does not use tempfiles or create these - # atomically, confusing a parallel build. So we force them first. - emake lexer.c config_gram.c config_gram.h || die "emake of lexer failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog* NEWS README || die "dodoc failed" - - if use doc ; then - newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf || \ - die "newdoc failed" - dohtml -r "${WORKDIR}/avrdude-html/" || die "dohtml failed" - fi -} diff --git a/dev-embedded/avrdude/avrdude-5.8.ebuild b/dev-embedded/avrdude/avrdude-5.8.ebuild deleted file mode 100644 index b03f7c461b28..000000000000 --- a/dev-embedded/avrdude/avrdude-5.8.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8.ebuild,v 1.2 2012/04/03 03:12:04 vapier Exp $ - -EAPI=2 - -DESCRIPTION="AVR Downloader/UploaDEr" -HOMEPAGE="http://savannah.nongnu.org/projects/avrdude" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz - doc? ( - mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz - mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc" - -RDEPEND="virtual/libusb:0" -DEPEND="${RDEPEND}" - -src_prepare() { - # let the build system re-generate these, bug #120194 - rm -f lexer.c config_gram.c config_gram.h -} - -src_compile() { - # The automake target for these files does not use tempfiles or create these - # atomically, confusing a parallel build. So we force them first. - emake lexer.c config_gram.c config_gram.h || die "emake of lexer failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog* NEWS README || die "dodoc failed" - - if use doc ; then - newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf || \ - die "newdoc failed" - dohtml -r "${WORKDIR}/avrdude-html/" || die "dohtml failed" - fi -} diff --git a/dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch b/dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch deleted file mode 100644 index d4d22bc83b05..000000000000 --- a/dev-embedded/avrdude/files/avrdude-5.10-jtagmkII-debugWire.patch +++ /dev/null @@ -1,22 +0,0 @@ -Suggested by Timon Van Overveldt <timonvo@gmail.com> -on https://savannah.nongnu.org/bugs/index.php?30268 - ---- avrdude-5.10/jtagmkII.c -+++ avrdude-5.10/jtagmkII.c -@@ -1270,10 +1270,12 @@ - return -1; - } - -- if (jtagmkII_setparm(pgm, PAR_DAISY_CHAIN_INFO, PDATA(pgm)->jtagchain) < 0) { -- fprintf(stderr, "%s: jtagmkII_initialize(): Failed to setup JTAG chain\n", -- progname); -- return -1; -+ if(strcmp(ifname, "debugWire") != 0) { -+ if (jtagmkII_setparm(pgm, PAR_DAISY_CHAIN_INFO, PDATA(pgm)->jtagchain) < 0) { -+ fprintf(stderr, "%s: jtagmkII_initialize(): Failed to setup JTAG chain\n", -+ progname); -+ return -1; -+ } - } - - /* diff --git a/dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch b/dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch deleted file mode 100644 index dc6225f38612..000000000000 --- a/dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch +++ /dev/null @@ -1,16 +0,0 @@ -Suggested by http://savannah.nongnu.org/users/alexdm -on http://savannah.nongnu.org/bugs/?27507 - ---- avrdude-5.8/stk500v2.c -+++ avrdude-5.8/stk500v2.c -@@ -3586,8 +3586,8 @@ - pgm->paged_load = stk500v2_paged_load; - pgm->print_parms = stk500v2_print_parms; - pgm->set_sck_period = stk500v2_set_sck_period_mk2; -- pgm->setup = jtagmkII_setup; -- pgm->teardown = jtagmkII_teardown; -+ pgm->setup = stk500v2_jtagmkII_setup; -+ pgm->teardown = stk500v2_jtagmkII_teardown; - pgm->page_size = 256; - } - |