On Tue, Feb 07, 2012 at 06:00:06PM +0100, [email protected] wrote: > From: Bernhard Walle <[email protected]> > > I don't know why the name of the tarball is completely different and I > also don't know why the tarball doesn't contain a directory. That's > upstream. > > At least the program builds and works correctly.
I cannot apply this. There are some line-end issues with it. Please resend. Michael > Signed-off-by: Bernhard Walle <[email protected]> > --- > patches/lpc21isp-1.79/lpc21isp-fix-arm.diff | 27 > --------------------------- > patches/lpc21isp-1.79/series | 1 - > patches/lpc21isp_183/lpc21isp-fix-arm.diff | 27 > +++++++++++++++++++++++++++ > patches/lpc21isp_183/series | 1 + > rules/lpc21isp.make | 9 +++++---- > 5 files changed, 33 insertions(+), 32 deletions(-) > delete mode 100644 patches/lpc21isp-1.79/lpc21isp-fix-arm.diff > delete mode 100644 patches/lpc21isp-1.79/series > create mode 100644 patches/lpc21isp_183/lpc21isp-fix-arm.diff > create mode 100644 patches/lpc21isp_183/series > > diff --git a/patches/lpc21isp-1.79/lpc21isp-fix-arm.diff > b/patches/lpc21isp-1.79/lpc21isp-fix-arm.diff > deleted file mode 100644 > index 9751db0..0000000 > --- a/patches/lpc21isp-1.79/lpc21isp-fix-arm.diff > +++ /dev/null > @@ -1,27 +0,0 @@ > -From: Bernhard Walle <[email protected]> > -Date: Mon, 20 Jun 2011 19:40:37 +0200 > -Subject: [PATCH] Fix build on ARM platform with Linux > - > -The lpc21isp developers think that ARM cannot run Linux. This is false, treat > -the ARM/Linux build just as building it on any platform. > - > -Signed-off-by: Bernhard Walle <[email protected]> > ---- > - lpc21isp.h | 4 ---- > - 1 files changed, 0 insertions(+), 4 deletions(-) > - > -diff --git a/lpc21isp.h b/lpc21isp.h > -index c9b9320..8190ddb 100644 > ---- a/lpc21isp.h > -+++ b/lpc21isp.h > -@@ -37,10 +37,6 @@ Portions Copyright (c) by Aeolus Development 2004 > http://www.aeolusdevelopment.c > - #elif defined(__CYGWIN__) > - #define COMPILE_FOR_CYGWIN > - #define COMPILED_FOR "Cygwin" > --#elif defined(__arm__) || defined(__thumb__) > --#define COMPILE_FOR_LPC21 > --#define COMPILED_FOR "ARM" > --#define printf iprintf > - #elif defined(__APPLE__) > - #define COMPILE_FOR_LINUX > - #define COMPILED_FOR "Apple MacOS X" > diff --git a/patches/lpc21isp-1.79/series b/patches/lpc21isp-1.79/series > deleted file mode 100644 > index 23cd858..0000000 > --- a/patches/lpc21isp-1.79/series > +++ /dev/null > @@ -1 +0,0 @@ > -lpc21isp-fix-arm.diff > diff --git a/patches/lpc21isp_183/lpc21isp-fix-arm.diff > b/patches/lpc21isp_183/lpc21isp-fix-arm.diff > new file mode 100644 > index 0000000..9751db0 > --- /dev/null > +++ b/patches/lpc21isp_183/lpc21isp-fix-arm.diff > @@ -0,0 +1,27 @@ > +From: Bernhard Walle <[email protected]> > +Date: Mon, 20 Jun 2011 19:40:37 +0200 > +Subject: [PATCH] Fix build on ARM platform with Linux > + > +The lpc21isp developers think that ARM cannot run Linux. This is false, treat > +the ARM/Linux build just as building it on any platform. > + > +Signed-off-by: Bernhard Walle <[email protected]> > +--- > + lpc21isp.h | 4 ---- > + 1 files changed, 0 insertions(+), 4 deletions(-) > + > +diff --git a/lpc21isp.h b/lpc21isp.h > +index c9b9320..8190ddb 100644 > +--- a/lpc21isp.h > ++++ b/lpc21isp.h > +@@ -37,10 +37,6 @@ Portions Copyright (c) by Aeolus Development 2004 > http://www.aeolusdevelopment.c > + #elif defined(__CYGWIN__) > + #define COMPILE_FOR_CYGWIN > + #define COMPILED_FOR "Cygwin" > +-#elif defined(__arm__) || defined(__thumb__) > +-#define COMPILE_FOR_LPC21 > +-#define COMPILED_FOR "ARM" > +-#define printf iprintf > + #elif defined(__APPLE__) > + #define COMPILE_FOR_LINUX > + #define COMPILED_FOR "Apple MacOS X" > diff --git a/patches/lpc21isp_183/series b/patches/lpc21isp_183/series > new file mode 100644 > index 0000000..23cd858 > --- /dev/null > +++ b/patches/lpc21isp_183/series > @@ -0,0 +1 @@ > +lpc21isp-fix-arm.diff > diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make > index 5393c51..2999eae 100644 > --- a/rules/lpc21isp.make > +++ b/rules/lpc21isp.make > @@ -16,13 +16,14 @@ PACKAGES-$(PTXCONF_LPC21ISP) += lpc21isp > # > # Paths and names > # > -LPC21ISP_VERSION := 1.79 > -LPC21ISP_MD5 := 93cf6b2a35d7e1d96a2887a21a8b2b77 > -LPC21ISP := lpc21isp-$(LPC21ISP_VERSION) > +LPC21ISP_VERSION := 1.83 > +LPC21ISP_MD5 := 4b437a6d6e718afa6d182f0c18f5363f > +LPC21ISP_STRIP_LEVEL := 0 > +LPC21ISP := lpc21isp_$(subst .,,$(LPC21ISP_VERSION)) > LPC21ISP_SUFFIX := tar.gz > LPC21ISP_URL := $(call ptx/mirror, SF, > lpc21isp/$(LPC21ISP_VERSION)/$(LPC21ISP).$(LPC21ISP_SUFFIX)) > LPC21ISP_SOURCE := $(SRCDIR)/$(LPC21ISP).$(LPC21ISP_SUFFIX) > -LPC21ISP_DIR := $(BUILDDIR)/lpc21isp > +LPC21ISP_DIR := $(BUILDDIR)/$(LPC21ISP) > LPC21ISP_LICENSE := GPLv3+ > > # > ---------------------------------------------------------------------------- > -- > 1.7.9 > > > -- > ptxdist mailing list > [email protected] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
