From 6bd0e18829654650a1fcbd101b0573ba0719963a Mon Sep 17 00:00:00 2001 From: Doug Anderson Date: Mon, 23 Jan 2012 18:56:19 +0000 Subject: [PATCH] Upgraded the smdk-dltool Portage package Upgraded dev-embedded/smdk-dltool to version 0.20 on amd64 CQ-DEPEND: I0eaa3a3c9cbf726129edeb0f3ca0bb5c123a94f4 BUG=chromium-os:25375 TEST=Manual: 1. sudo emerge smdk-dltool 2. sudo /usr/bin/smdk-usbdl finds board OK. Change-Id: I7a1f274878e6fa9eeba95f714aac2017f64ec7d8 Reviewed-on: https://gerrit.chromium.org/gerrit/14643 Tested-by: Doug Anderson Reviewed-by: Mike Frysinger Commit-Ready: Doug Anderson --- .../dev-embedded/smdk-dltool/Manifest | 1 + ...smdk-dltool-0.20-add-S3C64xx-support.patch | 66 +++++++++++++++++++ .../files/smdk-dltool-0.20-build.patch | 18 +++++ .../smdk-dltool/smdk-dltool-0.20.ebuild | 33 ++++++++++ 4 files changed, 118 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/Manifest b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/Manifest new file mode 100644 index 0000000000..6e6b6a33d8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/Manifest @@ -0,0 +1 @@ +DIST smdk-tools-v0.20.tar.gz 5170 RMD160 ba61a3a7727a826cafceb8330310f36d64147f6b SHA1 c598c8eae03afcdfc508c09808f6548ad6934f56 SHA256 fdda1a8ddb8b71a7a74e8efc85bd08ba8cb953a61eb610b846cf291436426e48 diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch new file mode 100644 index 0000000000..5b615aeb11 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch @@ -0,0 +1,66 @@ +From ed9e5da97fdb40082aca7acbdce5286b530fb2ba Mon Sep 17 00:00:00 2001 +From: Maurus Cuelenaere +Date: Mon, 11 Jan 2010 01:55:34 +0100 +Subject: [PATCH] Add S3C64xx support + +Author: unknown +URL: http://dev.odroid.com/frs/download.php/22/Linux-dltool.tar.gz +--- + dltool/dltool.c | 19 ++++++++++++++----- + 1 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/dltool/dltool.c b/dltool/dltool.c +index 4e2d238..e76e607 100644 +--- a/dltool/dltool.c ++++ b/dltool/dltool.c +@@ -26,6 +26,8 @@ char *dl_file = "download.dat"; + char *dl_udev = NULL; + char *dl_ubus = NULL; + ++int ep_out = 0; ++ + #define DBG(x) if (debug) { printf x; } + + void write_u32(unsigned char *dp, unsigned long val) +@@ -120,9 +122,15 @@ int verify_device(struct usb_device *dev) + DBG(("\t=> idVendor %x\n", dev->descriptor.idVendor)); + DBG(("\t=> idProduct %x\n", dev->descriptor.idProduct)); + +- if (dev->descriptor.idVendor == 0x5345 && +- dev->descriptor.idProduct == 0x1234) ++ if (dev->descriptor.idVendor == 0x5345 && dev->descriptor.idProduct == 0x1234) { ++ ep_out = 3; ++ return 1; ++ } ++ else if(dev->descriptor.idVendor == 0x4e8 && dev->descriptor.idProduct == 0x1234){ ++ printf("S3C64XX Detected!\n"); ++ ep_out = 2; + return 1; ++ } + + return 0; + } +@@ -180,9 +188,9 @@ int main(int argc, char **argv) + usb_dev_handle *devh; + int ret; + +- printf("SMDK42XX USB Download Tool\n"); ++ printf("SMDK42XX,S3C64XX USB Download Tool\n"); + printf("Version 0.20 (c) 2004,2005,2006" +- "Ben Dooks \n"); ++ " Ben Dooks \n"); + printf("\n"); + + while (1) { +@@ -309,7 +317,8 @@ int main(int argc, char **argv) + write_header(dl_data, dl_addr, dl_size); + calc_cksum(dl_data, dl_size); + +- ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000); ++ //ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000); ++ ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000); + printf("=> usb_bulk_write() returned %d\n", ret); + + if (ret != dl_size) { +-- +1.7.0.4 diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch new file mode 100644 index 0000000000..bf4ad1ba70 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch @@ -0,0 +1,18 @@ +respect env build settings + +--- a/releases/smdk-tools-v0.20/dltool/Makefile ++++ b/releases/smdk-tools-v0.20/dltool/Makefile +@@ -7,8 +7,11 @@ + + .PHONY: clean + +-dltool: dltool.c +- $(CC) -O2 -Wall -g -lusb -o smdk-usbdl dltool.c ++CFLAGS ?= -O2 -g ++CFLAGS += -Wall ++LDLIBS = -lusb ++ ++all: dltool + + clean: + -rm smdk-usbdl diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild new file mode 100644 index 0000000000..5580ca937d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/smdk-dltool/smdk-dltool-0.20.ebuild,v 1.1 2012/01/20 22:44:17 vapier Exp $ + +EAPI="4" + +inherit toolchain-funcs eutils + +DESCRIPTION="Tool to communicate with Samsung SMDK boards" +HOMEPAGE="http://www.fluff.org/ben/smdk/tools/" +SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz" + +# Email sent to author on 2012-01-18 querying about license +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-libs/libusb" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool + +src_prepare() { + epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch + epatch "${FILESDIR}"/${P}-build.patch + tc-export CC +} + +src_install() { + newbin dltool smdk-usbdl + dodoc readme.txt +}