Forum Discussion
Altera_Forum
Honored Contributor
20 years agoU-Boot git repository
Hi All,
CVS support for u-boot is EOL: http://forum.niosforum.com/forum/index.php...indpost&p=15735 (http://forum.niosforum.com/forum/index.php?act=st&f=18&t=4025&hl=&view=findpost&p=15735) A git repository has been setup at psyent.com specifically to support Nios II. The u-boot maintainers will now be able to pull from this repo directly into the main source tree ... so hopefully this will help speed things up. Currently the psyent repo contains only the patches that are still pending under the old u-boot patch system -- this is tagged "NIOS2-5_0_0". More updates/features soon -- as time permits. Here's how to get the latest code: method 1: clone the psyent repository<span style="color:blue"># # Just get everything from psyent, the default branch will be 'nios2' $ git clone http://www.psyent.com/git/uboot (http://www.psyent.com/git/uboot) u-boot.git </span> method 2: clone the main repository, pull from psyent<span style="color:blue"># # Clone the main source repo -- without the current patches $ git clone rsync://source.denx.net/git/u-boot.git u-boot.git # # Create the 'nios2' branch $ cd u-boot.git $ git branch -f nios2 master $ git checkout nios2 # # Pull the nios2 branch from psyent $ git pull http://www.psyent.com/git/uboot (http://www.psyent.com/git/uboot) nios2</span> I will eventually produce some beginner docs to help WRT git/u-boot and deposit them in the Wiki (many thanks to hippo). =========================================================== Now, the side-effects: -- GOOD: You need git ... you will be able to keep your source tree (and private brances) up to date very easily by pulling from the main repo (general u-boot updates) and from psyent (Nios II updates). -- GOOD: Contributing to u-boot is easier. You can send me patches, I'll add them to the psyent repo & Wolfgang can pull from psyent. Or you can just setup your own repo. -- BAD: You need git ... if you're developing in a linux/unix environment, you can start learing git without much trouble. If you're not, you can try using the git cygwin port -- but this can be problematic. If you go this route, I recommend you get the latest cygwin. Either way, git is not the easiest system to use -- but with a little effort you'll find it's quite powerful. -- BAD: Limited tarball updates. I will update the u-boot source tarball (cygwin friendly) at psyent as time permits -- but this is not a high priority. Regards, --Scott6 Replies
- Altera_Forum
Honored Contributor
Awesome.
That's very helpful. - Altera_Forum
Honored Contributor
Hi hippo,
If you can spare the time -- I'd be grateful if you could try cloning from denx and pulling from psyent -- and let me know if you have any problems. Many thanks, --Scott - Altera_Forum
Honored Contributor
--- Quote Start --- originally posted by smcnutt@Jun 9 2006, 09:41 AM hi hippo,if you can spare the time -- i'd be grateful if you could try cloning from denx and pulling from psyent --
and let me know if you have any problems.
many thanks,
--scott
<div align='right'><{post_snapback}> (index.php?act=findpost&pid=16049)
--- quote end ---
--- Quote End --- I tried method 1. and stop at (look like an old tag) <div class='quotetop'>QUOTE </div> --- Quote Start --- $ git clone http://www.psyent.com/git/uboot (http://www.psyent.com/git/uboot) u-boot.git Getting alternates list for http://www.psyent.com/git/uboot/ (http://www.psyent.com/git/uboot/) Getting pack list for http://www.psyent.com/git/uboot/ (http://www.psyent.com/git/uboot/) Getting index for pack 8630232f0808da1a3b288f353e522a737c65c05b Getting index for pack 307a4ccb7a3ef9094f77cbf2c1bd60416c5f7b12 Getting index for pack 2a2ae5b5d29e02e7330c674195b3423487f83452 Getting index for pack a9332d1f4f7916094b9ebeef60378603168d77e2 Getting pack 307a4ccb7a3ef9094f77cbf2c1bd60416c5f7b12 which contains e461a24113c66747510b07930a83b0d84171a559 walk e461a24113c66747510b07930a83b0d84171a559 walk 4526c87eeca107d5dba69a449b6c8bc68d1b2b35 Getting pack a9332d1f4f7916094b9ebeef60378603168d77e2 which contains 73d9625beadea1a39a4073f95da9be2f944806a8 Getting pack 8630232f0808da1a3b288f353e522a737c65c05b which contains 0603fd6c2bbaef61ea3e8efb67a440b63e0c6b60 Getting pack 2a2ae5b5d29e02e7330c674195b3423487f83452 which contains 54775d31dfef42fe0295640054976f691c1e48b3 walk 2fd9eb509ddd557550214d472ec6170761e0c7d6 walk 5abc2c5d4c9b17fcce108da1b7dd74c3996b58da ....... walk ed579b4210cc5341d511e090239ca697e91ad728 error: Couldn't get http://www.psyent.com/git/uboot/refs/tags/...f10%5f06%5f2355 (http://www.psyent.com/git/uboot/refs/tags/label%5f2003%5f10%5f06%5f2355) for tags/LABEL_2003_10_06_2355 Couldn't resolve host 'www.psyent.com' error: Could not interpret tags/LABEL_2003_10_06_2355 as something to pull[/b] --- Quote End --- And the download dir is empty.
- Altera_Forum
Honored Contributor
--- Quote Start --- originally posted by smcnutt@Jun 9 2006, 09:41 AM hi hippo,if you can spare the time -- i'd be grateful if you could try cloning from denx and pulling from psyent --
and let me know if you have any problems.
many thanks,
--scott
<div align='right'><{post_snapback}> (index.php?act=findpost&pid=16049)
--- quote end ---
--- Quote End --- Method 2 is OK. I will try make later. (ps, my git is git-1.3.3-1.fc5) <div class='quotetop'>QUOTE </div> --- Quote Start --- git pull http://www.psyent.com/git/uboot (http://www.psyent.com/git/uboot) nios2 Fetching refs/heads/nios2 from http://www.psyent.com/git/uboot (http://www.psyent.com/git/uboot) using http Getting alternates list for http://www.psyent.com/git/uboot/ (http://www.psyent.com/git/uboot/) Getting pack list for http://www.psyent.com/git/uboot/ (http://www.psyent.com/git/uboot/) Getting index for pack 307a4ccb7a3ef9094f77cbf2c1bd60416c5f7b12 Getting pack 307a4ccb7a3ef9094f77cbf2c1bd60416c5f7b12 which contains 9cc833783206efd25b4655aa451ce81e5cc28fc2 walk 9cc833783206efd25b4655aa451ce81e5cc28fc2 walk 1f6ce8f5ba013b9cfd2b8f9cea051d70f3b1bc43 walk 3d22d0b89bb3d669e27ff98d15ab013fbe04ee87 walk c2ced000f4f18361feb36ea257fabbb46913e1d4 Updating from e461a24113c66747510b07930a83b0d84171a559 to 9cc833783206efd25b4655aa451ce81e5cc28fc2 Fast forward CHANGELOG | 21 ++++ MAINTAINERS | 3 + MAKEALL | 2 Makefile | 9 ++ README | 1 board/altera/common/AMDLV065D.c | 190 +++++++++++++++++++++++++++++++++++++ board/altera/common/epled.c | 62 ++++++++++++ board/altera/ep1c20/Makefile | 50 ++++++++++ board/altera/ep1c20/config.mk | 31 ++++++ board/altera/ep1c20/ep1c20.c | 40 ++++++++ board/altera/ep1c20/u-boot.lds | 136 +++++++++++++++++++++++++++ board/altera/ep1s10/Makefile | 50 ++++++++++ board/altera/ep1s10/config.mk | 31 ++++++ board/altera/ep1s10/ep1s10.c | 40 ++++++++ board/altera/ep1s10/u-boot.lds | 136 +++++++++++++++++++++++++++ board/altera/ep1s40/Makefile | 50 ++++++++++ board/altera/ep1s40/config.mk | 31 ++++++ board/altera/ep1s40/ep1s40.c | 35 +++++++ board/altera/ep1s40/u-boot.lds | 136 +++++++++++++++++++++++++++ board/psyent/common/AMDLV065D.c | 57 +++++------ board/psyent/pk1c20/config.mk | 2 board/psyent/pk1c20/led.c | 14 +-- cpu/nios2/epcs.c | 38 +++++-- cpu/nios2/exceptions.S | 3 + cpu/nios2/interrupts.c | 18 ++-- cpu/nios2/serial.c | 26 ++--- cpu/nios2/sysid.c | 11 +- examples/Makefile | 2 examples/stubs.c | 2 include/asm-nios2/io.h | 7 + include/configs/EP1C20.h | 199 +++++++++++++++++++++++++++++++++++++++ include/configs/EP1S10.h | 193 ++++++++++++++++++++++++++++++++++++++ include/configs/EP1S40.h | 193 ++++++++++++++++++++++++++++++++++++++ include/configs/PK1C20.h | 20 ++-- include/nios2-epcs.h | 5 + lib_nios2/board.c | 10 ++ nios2_config.mk | 2 37 files changed, 1762 insertions(+), 94 deletions(-) create mode 100644 board/altera/common/AMDLV065D.c create mode 100644 board/altera/common/epled.c create mode 100644 board/altera/ep1c20/Makefile create mode 100644 board/altera/ep1c20/config.mk create mode 100644 board/altera/ep1c20/ep1c20.c create mode 100644 board/altera/ep1c20/u-boot.lds create mode 100644 board/altera/ep1s10/Makefile create mode 100644 board/altera/ep1s10/config.mk create mode 100644 board/altera/ep1s10/ep1s10.c create mode 100644 board/altera/ep1s10/u-boot.lds create mode 100644 board/altera/ep1s40/Makefile create mode 100644 board/altera/ep1s40/config.mk create mode 100644 board/altera/ep1s40/ep1s40.c create mode 100644 board/altera/ep1s40/u-boot.lds create mode 100644 include/configs/EP1C20.h create mode 100644 include/configs/EP1S10.h create mode 100644 include/configs/EP1S40.h[/b] --- Quote End ---
- Altera_Forum
Honored Contributor
Hi hippo,
Thanks for testing the repo :-) This has happened to me as well. When I run the clone a second time it works. Maybe a DNS lookup issue (timeout then failure). The referenced file is there -- but the host isn't resolved.<div class='quotetop'>QUOTE </div> --- Quote Start --- walk ed579b4210cc5341d511e090239ca697e91ad728 error: Couldn't get http://www.psyent.com/git/uboot/refs/tags/...f10%5f06%5f2355 (http://www.psyent.com/git/uboot/refs/tags/...f10%5f06%5f2355) for tags/LABEL_2003_10_06_2355 couldn't resolve host 'www.psyent.com'[/b] --- Quote End --- > Method 2 is OK. Great! > ps, my git is git-1.3.3-1.fc5 Same for me -- 1.3.3 on FC5. Thanks again, --Scott - Altera_Forum
Honored Contributor
Just an update:
The main u-boot git repository is now up to date with the nios2 branch at psyent. So you can now just clone the main repository at denx ... $ git clone rsync://source.denx.net/git/u-boot.git u-boot.git and from time-to-time, just pull the master branch to stay up to date with the common u-boot code. $ git pull rsync://source.denx.net/git/u-boot.git master I will post announcements when updates are added to the psyent repo (and when the updates are subsequently pulled into the main tree). During the period when the main source tree lags psyent, you can simply pull updates directly from the psyent nios2 branch: <span style="color:blue"> $ git pull http://www.psyent.com/git/uboot (http://www.psyent.com/git/uboot) nios2 </span> If you need some information on how to use git, I've found the following sites to be most helpful: Hacker's Guide: http://linux.yyz.us/git-howto.html (http://linux.yyz.us/git-howto.html) Everyday GIT: http://www.kernel.org/pub/software/scm/git...s/everyday.html (http://www.kernel.org/pub/software/scm/git/docs/everyday.html) Tutorial (Part 1): http://www.kernel.org/pub/software/scm/git...s/tutorial.html (http://www.kernel.org/pub/software/scm/git/docs/tutorial.html) Tutorial (Part 2): http://www.kernel.org/pub/software/scm/git...tutorial-2.html (http://www.kernel.org/pub/software/scm/git/docs/tutorial-2.html) Regards, --Scott