* [ptxdist] [PATCH] lpc21isp: Update to 1.85
@ 2013-03-19 14:49 Thomas Weber
2013-03-19 15:28 ` Michael Olbrich
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Weber @ 2013-03-19 14:49 UTC (permalink / raw)
To: ptxdist; +Cc: bernhard, Thomas Weber
The patch for building lpc21isp on ARM Linux
is included in the sources.
Signed-off-by: Thomas Weber <thomas.weber@corscience.de>
---
patches/lpc21isp_183/lpc21isp-fix-arm.diff | 27 ---------------------------
patches/lpc21isp_183/series | 1 -
rules/lpc21isp.make | 4 ++--
3 files changed, 2 insertions(+), 30 deletions(-)
delete mode 100644 patches/lpc21isp_183/lpc21isp-fix-arm.diff
delete mode 100644 patches/lpc21isp_183/series
diff --git a/patches/lpc21isp_183/lpc21isp-fix-arm.diff b/patches/lpc21isp_183/lpc21isp-fix-arm.diff
deleted file mode 100644
index 9751db0..0000000
--- a/patches/lpc21isp_183/lpc21isp-fix-arm.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Bernhard Walle <walle@corscience.de>
-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 <walle@corscience.de>
----
- 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
deleted file mode 100644
index 23cd858..0000000
--- a/patches/lpc21isp_183/series
+++ /dev/null
@@ -1 +0,0 @@
-lpc21isp-fix-arm.diff
diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
index 2999eae..132a0c9 100644
--- a/rules/lpc21isp.make
+++ b/rules/lpc21isp.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LPC21ISP) += lpc21isp
#
# Paths and names
#
-LPC21ISP_VERSION := 1.83
-LPC21ISP_MD5 := 4b437a6d6e718afa6d182f0c18f5363f
+LPC21ISP_VERSION := 1.85
+LPC21ISP_MD5 := e80c16b252a5198b6ed3b5559af350d6
LPC21ISP_STRIP_LEVEL := 0
LPC21ISP := lpc21isp_$(subst .,,$(LPC21ISP_VERSION))
LPC21ISP_SUFFIX := tar.gz
--
1.8.2
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] lpc21isp: Update to 1.85
2013-03-19 14:49 [ptxdist] [PATCH] lpc21isp: Update to 1.85 Thomas Weber
@ 2013-03-19 15:28 ` Michael Olbrich
2013-03-19 15:38 ` Bernhard Walle
0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2013-03-19 15:28 UTC (permalink / raw)
To: ptxdist
On Tue, Mar 19, 2013 at 03:49:36PM +0100, Thomas Weber wrote:
> The patch for building lpc21isp on ARM Linux
> is included in the sources.
This fails to apply here.
Michael
> Signed-off-by: Thomas Weber <thomas.weber@corscience.de>
> ---
> patches/lpc21isp_183/lpc21isp-fix-arm.diff | 27 ---------------------------
> patches/lpc21isp_183/series | 1 -
> rules/lpc21isp.make | 4 ++--
> 3 files changed, 2 insertions(+), 30 deletions(-)
> delete mode 100644 patches/lpc21isp_183/lpc21isp-fix-arm.diff
> delete mode 100644 patches/lpc21isp_183/series
>
> diff --git a/patches/lpc21isp_183/lpc21isp-fix-arm.diff b/patches/lpc21isp_183/lpc21isp-fix-arm.diff
> deleted file mode 100644
> index 9751db0..0000000
> --- a/patches/lpc21isp_183/lpc21isp-fix-arm.diff
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From: Bernhard Walle <walle@corscience.de>
> -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 <walle@corscience.de>
> ----
> - 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
> deleted file mode 100644
> index 23cd858..0000000
> --- a/patches/lpc21isp_183/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -lpc21isp-fix-arm.diff
> diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
> index 2999eae..132a0c9 100644
> --- a/rules/lpc21isp.make
> +++ b/rules/lpc21isp.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LPC21ISP) += lpc21isp
> #
> # Paths and names
> #
> -LPC21ISP_VERSION := 1.83
> -LPC21ISP_MD5 := 4b437a6d6e718afa6d182f0c18f5363f
> +LPC21ISP_VERSION := 1.85
> +LPC21ISP_MD5 := e80c16b252a5198b6ed3b5559af350d6
> LPC21ISP_STRIP_LEVEL := 0
> LPC21ISP := lpc21isp_$(subst .,,$(LPC21ISP_VERSION))
> LPC21ISP_SUFFIX := tar.gz
> --
> 1.8.2
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
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
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] lpc21isp: Update to 1.85
2013-03-19 15:28 ` Michael Olbrich
@ 2013-03-19 15:38 ` Bernhard Walle
2013-03-19 18:34 ` Thomas Weber
0 siblings, 1 reply; 5+ messages in thread
From: Bernhard Walle @ 2013-03-19 15:38 UTC (permalink / raw)
To: ptxdist; +Cc: thomas.weber
Hi,
* Michael Olbrich <m.olbrich@pengutronix.de> [2013-03-19 16:28]:
> On Tue, Mar 19, 2013 at 03:49:36PM +0100, Thomas Weber wrote:
> > The patch for building lpc21isp on ARM Linux
> > is included in the sources.
>
> This fails to apply here.
I remember strange line endings in the patch. Thomas has to send the
patch as attached gzip file.
http://www.mail-archive.com/ptxdist@pengutronix.de/msg04539.html
Or he finds the git options I didn't find last year. :)
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] lpc21isp: Update to 1.85
2013-03-19 15:38 ` Bernhard Walle
@ 2013-03-19 18:34 ` Thomas Weber
2013-03-20 8:12 ` Michael Olbrich
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Weber @ 2013-03-19 18:34 UTC (permalink / raw)
To: ptxdist; +Cc: Bernhard Walle, thomas.weber
Hello Michael,
On 03/19/2013 04:38 PM, Bernhard Walle wrote:
> Hi,
>
> * Michael Olbrich <m.olbrich@pengutronix.de> [2013-03-19 16:28]:
>> On Tue, Mar 19, 2013 at 03:49:36PM +0100, Thomas Weber wrote:
>>> The patch for building lpc21isp on ARM Linux
>>> is included in the sources.
>> This fails to apply here.
> I remember strange line endings in the patch. Thomas has to send the
> patch as attached gzip file.
>
> http://www.mail-archive.com/ptxdist@pengutronix.de/msg04539.html
>
> Or he finds the git options I didn't find last year. :)
>
can you try
git am --ignore-whitespace <patch>
I tried something with --keep-cr and crlf in the repo, but this seems to
be the best option.
Thomas
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] lpc21isp: Update to 1.85
2013-03-19 18:34 ` Thomas Weber
@ 2013-03-20 8:12 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2013-03-20 8:12 UTC (permalink / raw)
To: ptxdist
On Tue, Mar 19, 2013 at 07:34:49PM +0100, Thomas Weber wrote:
> Hello Michael,
>
> On 03/19/2013 04:38 PM, Bernhard Walle wrote:
> > Hi,
> >
> > * Michael Olbrich <m.olbrich@pengutronix.de> [2013-03-19 16:28]:
> >> On Tue, Mar 19, 2013 at 03:49:36PM +0100, Thomas Weber wrote:
> >>> The patch for building lpc21isp on ARM Linux
> >>> is included in the sources.
> >> This fails to apply here.
> > I remember strange line endings in the patch. Thomas has to send the
> > patch as attached gzip file.
> >
> > http://www.mail-archive.com/ptxdist@pengutronix.de/msg04539.html
> >
> > Or he finds the git options I didn't find last year. :)
> >
>
> can you try
>
> git am --ignore-whitespace <patch>
>
> I tried something with --keep-cr and crlf in the repo, but this seems to
> be the best option.
That works. And we're just removing the patch so it whitespaces don't
matter. Thanks, applied.
Michael
--
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
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-03-20 8:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-19 14:49 [ptxdist] [PATCH] lpc21isp: Update to 1.85 Thomas Weber
2013-03-19 15:28 ` Michael Olbrich
2013-03-19 15:38 ` Bernhard Walle
2013-03-19 18:34 ` Thomas Weber
2013-03-20 8:12 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox