AVR32 git tree merge?
Is the AVR32 tree likely to be merged into the main tree any time soon? or should I just sync to the branch in the mean time.
Cheers
Signature · 17 lines
Robin Gilks Senior Design Engineer Phone: (+64)(3) 357 1569 Tait Electronics Fax : (+64)(3) 359 4632 PO Box 1645 Christchurch Email : robin.gilks at tait.co.nz New Zealand ======================================================================= This email, including any attachments, is only for the intended addressee. It is subject to copyright, is confidential and may be the subject of legal or other privilege, none of which is waived or lost by reason of this transmission. If the receiver is not the intended addressee, please accept our apologies, notify us by return, delete all copies and perform no other act on the email. Unfortunately, we cannot warrant that the email has not been altered or corrupted during transmission. =======================================================================
Quoted 2 lines · In message <[email protected]> you wrote:
Is the AVR32 tree likely to be merged into the main tree any time soon? or should I just sync to the branch in the mean time.
It would definitely be useful if you could help testing the AVR32 tree and send your reports to the list and the custodian; it's then up to Haavard Skinnemoen to tell me when to pull from this repository.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de If you hear an onion ring, answer it.
Its working great for me. I had to pull a snapshot from gitweb though, I could not get the ngw100 stuff to show up in my tree pull. I probably did something wrong.
Mike
Quoted 13 lines · Wolfgang Denk
Quoted 2 lines · In message <[email protected]> you wrote:
Is the AVR32 tree likely to be merged into the main tree any time soon? or should I just sync to the branch in the mean time.
It would definitely be useful if you could help testing the AVR32 tree and send your reports to the list and the custodian; it's then up to Haavard Skinnemoen to tell me when to pull from this repository.
Best regards,
Wolfgang Denk
Quoted 2 lines · Robin Gilks
Is the AVR32 tree likely to be merged into the main tree any time soon? or should I just sync to the branch in the mean time.
Most of it _is_ merged, but the ngw100 board support code is one notable exception. I would like to get rid of the flash driver first and switch to the cfi driver since it's currently duplicated in boards/atmel/atstk1000/flash.c and boards/atmel/atngw100/flash.c, but I haven't had the time to get to the bottom of all the issues that prevents me from doing this.
In the mean time, I suggest you clone the official u-boot tree and pull the ngw-board branch from the avr32 custodian tree into it. It should be pretty self-contained so there shouldn't be any conflicts, but if you notice any build or other breakage, please notify me. Cc'ing hskinnemoen at atmel.com might give you a quicker response.
To pull the ngw-board branch into your working tree (which should preferably contain an up-to-date copy of Wolfgang's master tree):
git checkout -b my-ngw-stuff # create new branch and switch to it
git pull git://www.denx.de/git/u-boot-avr32.git ngw-board
To clone the avr32 tree and use the ngw-board branch directly:
git clone git://www.denx.de/git/u-boot-avr32.git u-boot-avr32 cd u-boot-avr32
git checkout ngw-board
After you follow one of those procedures, the working copy should be ready to run make atngw100_config && make.
I'm sorry I haven't done a lot of work on the avr32 port lately, but I'm a bit bogged down with other tasks and I haven't received any reports that it doesn't actually work (there has been a lot more trouble with our own 1.1.4 "fork", which we will get rid of as soon as possible.)
Haavard