LetuxOS U-Boot

Issue 154: Rebase code on mainline git

Reported by Nikolaus Schaller, Oct 19, 2010

It looks as if some OMAP3/OMAP4 pacthes for Beagle and Panda board 
have found their way into mainline

git://git.denx.de/u-boot.git

So we may rebase our U-Boot git.

Comment 1 by Nikolaus Schaller, Oct 20, 2010

Here is the procedure:

1. git remote add denx git://git.denx.de/u-boot.git
2. git pull denx master
3. resolve conflicts (and restore some files to the original state)

Comment 2 by Nikolaus Schaller, Nov 26, 2010

finally done!

Was quite complicated to (re)move our patches from the beagle.c and 
beagle.h and place into separate beaglehyb.c and beaglehyb.h files - 
and just #include the original ones.
Status: Fixed

Created: 14 years 6 months ago by Nikolaus Schaller

Updated: 14 years 5 months ago

Status: Fixed

Owner: Nikolaus Schaller

Labels:
Type:Enhancement
Priority:High