Martin Guy |
Hi Renaud
I've updated your patch to svn head and we've tested it on an EVK1100. It says: eLua# lua /rom/dataflash.lua Press CTRL+Z to exit Lua JEDEC Manufacturer ID : 31 This single patch seems to do several separate things: - add EKV1101 (and the at32uc3a0256 CPU part) - introduce a mechanism for having several avr32 boards, each with its pwn separate platform_conf.h file (in EVK1100/evk1100_conf.h etc) - add SPI for AVR32 - add romfs/dataflash.lua script - fix a bug in existing flash size calculation for EVK1100: +++ src/platform/avr32/at32uc3a0512.ld (working copy) @@ -1,7 +1,7 @@ MEMORY { sram (W!RX) : ORIGIN = 0x00000004, LENGTH = 0x0000FFFC - flash (RX) : ORIGIN = 0x80002000, LENGTH = 0x00080000 + flash (RX) : ORIGIN = 0x80002000, LENGTH = 0x00080000 - 0x2000 } Lastly, the code in spi.c and spi.h is obviously a derivative of the Atmel code in "ATMEL AVR32-SoftwareFramework-AT32UC3-1.6.1 Release" but the copyright boilerplate has been removed from the start of their file. I don't know what elua's copyright strategy is, but I attach the original notice in case eLua wants to keep it, maybe in a modified form. Thanks again for these patches, which make my work much easier to complete. M _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev atmel-copyright.txt (2K) Download Attachment evk1101_and_spi_for_svn765.patch (56K) Download Attachment |
Hi Martin,
Thanks for pointing me out the copyright issues ! You're true, the patch is doing far more than previously claimed :) Hoping to see eLua spreading more and more... On Sun, Aug 1, 2010 at 11:14 AM, Martin Guy <[hidden email]> wrote: Hi Renaud _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Hi Martin,
Thanks for pointing me out the copyright issues ! You're true, the patch is doing far more than previously claimed :) Hoping to see eLua spreading more and more... On Mon, Aug 2, 2010 at 12:04 PM, Renaud <[hidden email]> wrote: Hi Martin, _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Dado Sutter |
In reply to this post by Martin Guy
Hello guys,
Thank you for the test reports and for the copyright note Martin. eLua keeps every copyright notice in the original code it eventually uses and this is usually required by manufacturer's licences. Best Dado On Sun, Aug 1, 2010 at 06:14, Martin Guy <[hidden email]> wrote: Hi Renaud _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Thanks for the updates Martin & Renaud. As Dado notes, I think if
there was copyright notice at the top of that file it should be put back in place if its a derivative work, or certainly any mixed/derivative files should note the license and where it can be found. We may also need to contact Atmel regarding this clause: * 4. This software may only be redistributed and used in connection with an Atmel * AVR product. Though, as long as the code is within the avr32 platform port, I believe we're OK. I believe the Luminary Micro drivers have a similar stipulation in their license. Other than these issues, is this patch considered to be prepared for submission/inclusion? I don't have an AVR32 platform to do any testing. On Mon, Aug 2, 2010 at 4:52 PM, Dado Sutter <[hidden email]> wrote: > Hello guys, > Thank you for the test reports and for the copyright note Martin. > eLua keeps every copyright notice in the original code it eventually uses > and this is usually required by manufacturer's licences. > > Best > Dado > > > > On Sun, Aug 1, 2010 at 06:14, Martin Guy <[hidden email]> wrote: >> >> Hi Renaud >> I've updated your patch to svn head and we've tested it on an EVK1100. >> It says: >> eLua# >> lua /rom/dataflash.lua >> Press CTRL+Z to exit >> Lua >> >> JEDEC Manufacturer ID : 31 >> >> This single patch seems to do several separate things: >> >> - add EKV1101 (and the at32uc3a0256 CPU part) >> - introduce a mechanism for having several avr32 boards, each with its >> pwn separate platform_conf.h file (in EVK1100/evk1100_conf.h etc) >> - add SPI for AVR32 >> - add romfs/dataflash.lua script >> - fix a bug in existing flash size calculation for EVK1100: >> >> +++ src/platform/avr32/at32uc3a0512.ld (working copy) >> @@ -1,7 +1,7 @@ >> MEMORY >> { >> sram (W!RX) : ORIGIN = 0x00000004, LENGTH = 0x0000FFFC >> - flash (RX) : ORIGIN = 0x80002000, LENGTH = 0x00080000 >> + flash (RX) : ORIGIN = 0x80002000, LENGTH = 0x00080000 - 0x2000 >> } >> >> Lastly, the code in spi.c and spi.h is obviously a derivative of the >> Atmel code in >> "ATMEL AVR32-SoftwareFramework-AT32UC3-1.6.1 Release" but the >> copyright boilerplate has been removed from the start of their file. I >> don't know what elua's copyright strategy is, but I attach the >> original notice in case eLua wants to keep it, maybe in a modified >> form. >> >> Thanks again for these patches, which make my work much easier to >> complete. >> >> M >> >> _______________________________________________ >> eLua-dev mailing list >> [hidden email] >> https://lists.berlios.de/mailman/listinfo/elua-dev >> > > > _______________________________________________ > eLua-dev mailing list > [hidden email] > https://lists.berlios.de/mailman/listinfo/elua-dev > > -- James Snyder Biomedical Engineering Northwestern University [hidden email] PGP: http://fanplastic.org/key.txt Phone: (847) 448-0386 _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
On Tue, Aug 3, 2010 at 3:52 AM, James Snyder <[hidden email]> wrote:
> Other than these issues, is this patch considered to be prepared for > submission/inclusion? I don't have an AVR32 platform to do any > testing. Renaud already tested it, so I'd say it's ready. I was actually 100% sure that I already included it :), but it seems I forgot about that. Sorry, Renaud. I'll do it as soon as I'm back at home, where I have access to a decent Unix environment :) Best, Bogdan > > On Mon, Aug 2, 2010 at 4:52 PM, Dado Sutter <[hidden email]> wrote: >> Hello guys, >> Thank you for the test reports and for the copyright note Martin. >> eLua keeps every copyright notice in the original code it eventually uses >> and this is usually required by manufacturer's licences. >> >> Best >> Dado >> >> >> >> On Sun, Aug 1, 2010 at 06:14, Martin Guy <[hidden email]> wrote: >>> >>> Hi Renaud >>> I've updated your patch to svn head and we've tested it on an EVK1100. >>> It says: >>> eLua# >>> lua /rom/dataflash.lua >>> Press CTRL+Z to exit >>> Lua >>> >>> JEDEC Manufacturer ID : 31 >>> >>> This single patch seems to do several separate things: >>> >>> - add EKV1101 (and the at32uc3a0256 CPU part) >>> - introduce a mechanism for having several avr32 boards, each with its >>> pwn separate platform_conf.h file (in EVK1100/evk1100_conf.h etc) >>> - add SPI for AVR32 >>> - add romfs/dataflash.lua script >>> - fix a bug in existing flash size calculation for EVK1100: >>> >>> +++ src/platform/avr32/at32uc3a0512.ld (working copy) >>> @@ -1,7 +1,7 @@ >>> MEMORY >>> { >>> sram (W!RX) : ORIGIN = 0x00000004, LENGTH = 0x0000FFFC >>> - flash (RX) : ORIGIN = 0x80002000, LENGTH = 0x00080000 >>> + flash (RX) : ORIGIN = 0x80002000, LENGTH = 0x00080000 - 0x2000 >>> } >>> >>> Lastly, the code in spi.c and spi.h is obviously a derivative of the >>> Atmel code in >>> "ATMEL AVR32-SoftwareFramework-AT32UC3-1.6.1 Release" but the >>> copyright boilerplate has been removed from the start of their file. I >>> don't know what elua's copyright strategy is, but I attach the >>> original notice in case eLua wants to keep it, maybe in a modified >>> form. >>> >>> Thanks again for these patches, which make my work much easier to >>> complete. >>> >>> M >>> >>> _______________________________________________ >>> eLua-dev mailing list >>> [hidden email] >>> https://lists.berlios.de/mailman/listinfo/elua-dev >>> >> >> >> _______________________________________________ >> eLua-dev mailing list >> [hidden email] >> https://lists.berlios.de/mailman/listinfo/elua-dev >> >> > > > > -- > James Snyder > Biomedical Engineering > Northwestern University > [hidden email] > PGP: http://fanplastic.org/key.txt > Phone: (847) 448-0386 > _______________________________________________ > eLua-dev mailing list > [hidden email] > https://lists.berlios.de/mailman/listinfo/elua-dev > eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Fully tested on EVK1101. Martin tested on EVK1100, right ?
On Tue, Aug 3, 2010 at 9:05 AM, Bogdan Marinescu <[hidden email]> wrote:
_______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Martin Guy |
> > On Tue, Aug 3, 2010 at 3:52 AM, James Snyder <[hidden email]>
> wrote: > > > Other than these issues, is this patch considered to be prepared for > > > submission/inclusion? I don't have an AVR32 platform to do any > > > testing. > > > > Renaud already tested it, so I'd say it's ready. I was actually 100% > > sure that I already included it :), but it seems I forgot about that. > > Sorry, Renaud. I'll do it as soon as I'm back at home, where I have > > access to a decent Unix environment :) On 8/3/10, Renaud <[hidden email]> wrote: > Fully tested on EVK1101. Martin tested on EVK1100, right ? We tested my updated patch to svn head on an EVK1100, which gave the same result that Renaud said we should expect from it by running dataflash.lua M _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
In reply to this post by Martin Guy
On Sun, Aug 1, 2010 at 12:14 PM, Martin Guy <[hidden email]> wrote:
> Hi Renaud > I've updated your patch to svn head and we've tested it on an EVK1100. Hi, Are you sure the patch is made for rev 765? This is what I get: bogdanm@bogdanm-desktop:~/work/elua/trunk_765$ patch < /home/bogdanm/dl/evk1101_and_spi_for_svn765.patch patching file led.lua Hunk #1 FAILED at 17. 1 out of 1 hunk FAILED -- saving rejects to file led.lua.rej patching file dataflash.lua patching file evk1100_conf.h patching file evk1101_conf.h patching file evk1101.h patching file at32uc3a0512.ld Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file at32uc3a0512.ld.rej patching file at32uc3b0256.ld patching file platform.c Hunk #1 FAILED at 14. Hunk #2 FAILED at 25. Hunk #3 FAILED at 45. Hunk #4 FAILED at 111. Hunk #5 FAILED at 156. Hunk #6 FAILED at 351. Hunk #7 FAILED at 502. 7 out of 7 hunks FAILED -- saving rejects to file platform.c.rej patching file conf.py Hunk #1 FAILED at 1. Hunk #2 FAILED at 17. Hunk #3 FAILED at 31. 3 out of 3 hunks FAILED -- saving rejects to file conf.py.rej patching file spi.c patching file platform_conf.h Hunk #1 FAILED at 6. 1 out of 1 hunk FAILED -- saving rejects to file platform_conf.h.rej patching file spi.h patching file SConstruct Thanks, Bogdan _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
My initial patch was made with Tortoise. Does it succeed ? If yes, maybe Martin did something wrong ?
On Tue, Aug 3, 2010 at 11:39 PM, Bogdan Marinescu <[hidden email]> wrote:
_______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
On Wed, Aug 4, 2010 at 10:06 AM, Renaud <[hidden email]> wrote:
> My initial patch was made with Tortoise. Does it succeed ? If yes, maybe > Martin did something wrong ? I didn't try your original patch, sorry. And I can't do it now, I have to wait until I get home. Again :) Best, Bogdan > > On Tue, Aug 3, 2010 at 11:39 PM, Bogdan Marinescu > <[hidden email]> wrote: >> >> On Sun, Aug 1, 2010 at 12:14 PM, Martin Guy <[hidden email]> wrote: >> > Hi Renaud >> > I've updated your patch to svn head and we've tested it on an EVK1100. >> >> Hi, >> >> Are you sure the patch is made for rev 765? This is what I get: >> >> bogdanm@bogdanm-desktop:~/work/elua/trunk_765$ patch < >> /home/bogdanm/dl/evk1101_and_spi_for_svn765.patch >> patching file led.lua >> Hunk #1 FAILED at 17. >> 1 out of 1 hunk FAILED -- saving rejects to file led.lua.rej >> patching file dataflash.lua >> patching file evk1100_conf.h >> patching file evk1101_conf.h >> patching file evk1101.h >> patching file at32uc3a0512.ld >> Hunk #1 FAILED at 1. >> 1 out of 1 hunk FAILED -- saving rejects to file at32uc3a0512.ld.rej >> patching file at32uc3b0256.ld >> patching file platform.c >> Hunk #1 FAILED at 14. >> Hunk #2 FAILED at 25. >> Hunk #3 FAILED at 45. >> Hunk #4 FAILED at 111. >> Hunk #5 FAILED at 156. >> Hunk #6 FAILED at 351. >> Hunk #7 FAILED at 502. >> 7 out of 7 hunks FAILED -- saving rejects to file platform.c.rej >> patching file conf.py >> Hunk #1 FAILED at 1. >> Hunk #2 FAILED at 17. >> Hunk #3 FAILED at 31. >> 3 out of 3 hunks FAILED -- saving rejects to file conf.py.rej >> patching file spi.c >> patching file platform_conf.h >> Hunk #1 FAILED at 6. >> 1 out of 1 hunk FAILED -- saving rejects to file platform_conf.h.rej >> patching file spi.h >> patching file SConstruct >> >> Thanks, >> Bogdan >> _______________________________________________ >> eLua-dev mailing list >> [hidden email] >> https://lists.berlios.de/mailman/listinfo/elua-dev > > > _______________________________________________ > eLua-dev mailing list > [hidden email] > https://lists.berlios.de/mailman/listinfo/elua-dev > > eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Martin Guy |
In reply to this post by Renaud
> On Tue, Aug 3, 2010 at 11:39 PM, Bogdan Marinescu
> <[hidden email]> wrote: > > On Sun, Aug 1, 2010 at 12:14 PM, Martin Guy <[hidden email]> wrote: > > > Hi Renaud > > > I've updated your patch to svn head and we've tested it on an EVK1100. > > Are you sure the patch is made for rev 765? This is what I get: > > > > bogdanm@bogdanm-desktop:~/work/elua/trunk_765$ patch < > > /home/bogdanm/dl/evk1101_and_spi_for_svn765.patch > > patching file led.lua > > Hunk #1 FAILED at 17. > > 1 out of 1 hunk FAILED -- saving rejects to file led.lua.rej > > ... Yes. Before I posted, I did a fresh svn co, applied the patch, configured and built to be sure. However, I used patch -p0; I am surprised that plain "patch" works for you; for me that fails to find the target files (on Linux with FSF patch 2.5.9) It also works fine today with svn head r767. Is it possible that your copy of trunk has been modified ("svn status" and/or "svn revert -R .") or that the patch got mangled in the mailer (space/tab issues?) If the patch file got corrupted, you will find a clean copy to download from here http://martinwguy.co.uk/martin/evk1101_and_spi_for_svn765.patch md5sum is: 705ce0eb4cd4be09f5dca8866e25ad9f evk1101_and_spi_for_svn765.patch and length is 42100 bytes. Another thought is LF / CRLF issues - I see that some of the sources have plain linefeeds and others have MSDOS-style CR-LF line terminators, but the Unix environment seems not to complain about that. On 8/4/10, Renaud <[hidden email]> wrote: > My initial patch was made with Tortoise. Does it succeed ? If yes, maybe > Martin did something wrong ? It needs some work to apply it to svn head. In particular a lot of magic incantations changed to use comp[ 'foo' ] instead. If I remember correctly, the original patch applies to r740 cleanly, but doesn't compile due to an undefined preprocessor constant. M _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
On Wed, Aug 4, 2010 at 12:09 PM, Martin Guy <[hidden email]> wrote:
>> On Tue, Aug 3, 2010 at 11:39 PM, Bogdan Marinescu >> <[hidden email]> wrote: >> > On Sun, Aug 1, 2010 at 12:14 PM, Martin Guy <[hidden email]> wrote: >> > > Hi Renaud >> > > I've updated your patch to svn head and we've tested it on an EVK1100. >> > Are you sure the patch is made for rev 765? This is what I get: >> > >> > bogdanm@bogdanm-desktop:~/work/elua/trunk_765$ patch < >> > /home/bogdanm/dl/evk1101_and_spi_for_svn765.patch >> > patching file led.lua >> > Hunk #1 FAILED at 17. >> > 1 out of 1 hunk FAILED -- saving rejects to file led.lua.rej >> > ... > > Yes. Before I posted, I did a fresh svn co, applied the patch, > configured and built to be sure. > However, I used patch -p0; I am surprised that plain "patch" works for > you; for me that fails to find the target files (on Linux with FSF > patch 2.5.9) I also tried with '-p0' (which is indeed the right invocation in theory) and got somewhat similar results. > It also works fine today with svn head r767. Is it possible that your > copy of trunk has been modified ("svn status" and/or "svn revert -R > .") or that the patch got mangled in the mailer (space/tab issues?) I'm using a fresh trunk copy. I don't know about the space/tab issues, I guess that might happen. > If the patch file got corrupted, you will find a clean copy to > download from here > http://martinwguy.co.uk/martin/evk1101_and_spi_for_svn765.patch Thanks! I'll try this later today. Thanks, Bogdan > > On 8/4/10, Renaud <[hidden email]> wrote: >> My initial patch was made with Tortoise. Does it succeed ? If yes, maybe >> Martin did something wrong ? > > It needs some work to apply it to svn head. In particular a lot of > magic incantations changed to use comp[ 'foo' ] instead. > If I remember correctly, the original patch applies to r740 cleanly, > but doesn't compile due to an undefined preprocessor constant. > > M > _______________________________________________ > eLua-dev mailing list > [hidden email] > https://lists.berlios.de/mailman/listinfo/elua-dev > eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Let me know if I can do something on my side.
On Wed, Aug 4, 2010 at 11:13 AM, Bogdan Marinescu <[hidden email]> wrote:
_______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Martin Guy |
On 8/4/10, Renaud <[hidden email]> wrote:
> Let me know if I can do something on my side. You could check my version for svn-head, to see whether it applies to svn-head cleanly for you, to see if it works for you as it should on EVK1101, and to look through the changes by eye to see if I have made any mistakes while updating them. If you have the same problems applying them as Bogdan had, then maybe I need to prepare the patch in some different way that worksbetter on different systems. M _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Just tested the Martin's patch against both 765 and 767 (HEAD) with Tortoise SVN without (apparent) errors :)
Moreover, everything is compiling fine for both AVR32 platforms (Windows XP, latest Atmel's AVR32 Toolchain). Attached, the newly generated patch for rev.767 :) On Wed, Aug 4, 2010 at 11:40 AM, Martin Guy <[hidden email]> wrote:
_______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev evk1101_and_spi_for_svn767.patch (57K) Download Attachment |
On Wed, Aug 4, 2010 at 4:08 PM, Renaud <[hidden email]> wrote:
> Just tested the Martin's patch against both 765 and 767 (HEAD) with Tortoise > SVN without (apparent) errors :) > Moreover, everything is compiling fine for both AVR32 platforms (Windows XP, > latest Atmel's AVR32 Toolchain). > Attached, the newly generated patch for rev.767 :) Thanks, this one worked like a charm. Patch submitted to trunk. Best, Bogdan _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Martin Guy |
On 8/4/10, Bogdan Marinescu <[hidden email]> wrote:
> > Moreover, everything is compiling fine for both AVR32 platforms (Windows XP, > > latest Atmel's AVR32 Toolchain). > > Attached, the newly generated patch for rev.767 :) > > Thanks, this one worked like a charm. Patch submitted to trunk. The difference seems to be that Renaud's contains some CRLFs while mine contains none. I guess Unix must be stripping the CRs out and Windows need them. Sigh. Bogdan, you're working under Windows, yes? M _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
On Wed, Aug 4, 2010 at 5:38 PM, Martin Guy <[hidden email]> wrote:
> On 8/4/10, Bogdan Marinescu <[hidden email]> wrote: >> > Moreover, everything is compiling fine for both AVR32 platforms (Windows XP, >> > latest Atmel's AVR32 Toolchain). >> > Attached, the newly generated patch for rev.767 :) >> >> Thanks, this one worked like a charm. Patch submitted to trunk. > > The difference seems to be that Renaud's contains some CRLFs while > mine contains none. I guess Unix must be stripping the CRs out and > Windows need them. Sigh. > > Bogdan, you're working under Windows, yes? It's actually the other way around :) I applied the patch under Windows today, and it worked. Yesterday night, when it failed, I was using Ubuntu. Just out of curiosity, I'll try to apply the same patch again under Ubuntu when I get back home. Best, Bogdan _______________________________________________ eLua-dev mailing list [hidden email] https://lists.berlios.de/mailman/listinfo/elua-dev |
Free forum by Nabble | Edit this page |