Hi Mark, > -----Original Message----- > From: Mark A. Greer [mailto:[email protected]] > Sent: Wednesday, April 22, 2009 5:40 PM > > On Wed, Apr 22, 2009 at 12:58:12PM -0500, Ambrose, Martin wrote: > > > > -----Original Message----- > > > From: [email protected] > > > [mailto:[email protected]] On > Behalf > > > Of Mark A. Greer > > > Sent: Tuesday, April 21, 2009 7:13 PM > > > Subject: Re: [PATCH 2/3] ARM: da830 - Add base DA830/OMAP-L137 SoC > support > > > > > > On Tue, Apr 21, 2009 at 05:05:14PM -0700, Mark A. Greer wrote: > > > > From: Mark A. Greer <[email protected]> > > > >
[...] > > > 3) Applies to ed400fa274a55d88a320ba752a94837b02defc41 > > > > Thanks for this. It builds for me but hangs after uncompressing the > kernel. Do you see anything wrong with this sequence? > > > > $ git fetch > > $ git branch base ed400fa274a55d88a320ba752a94837b02defc41 > fm $ git checkout base > > $ patch -s -p1 < ../patches/PATCH-ARM-Add-writethrough-dcache-support- > for-ARM926EJS-processor.patch > > $ patch -s -p1 < ../patches/PATCH-1-3-ARM-DaVinci-Remove-unused-compare- > reg-defines.patch > > $ patch -s -p1 < ../patches/PATCH-2-3-ARM-da830-Add-base-DA830-OMAP- > L137-SoC-support.patch > > $ patch -s -p1 < ../patches/PATCH-3-3-ARM-da830-Add-support-for-DA830- > OMAP-L137-EVM.patch > > $ make ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabi- > da830_omapl137_defconfig > > $ make ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabi- uImage > > Looks like you're fetching but not merging. Try this: > > - 'git checkout master' > - 'git pull' > - 'git checkout -b da830_test master' (you'll be put on a branch called > da830_test) > - 'git am <the patches>' > - Build & test to see what happens. I guess I'm confused here. I have the davinci tree as a remote: $ git remote -v | grep davinci davinci http://www.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git And that by fetching I am getting all of the remote's objects into my local database but not merging into my current HEAD. I think this is what I want since my intent is to create a branch rooted at the commit id you provided. Then once on this branch there wouldn't be a need for any pulling/merging since my local tree is at the exact place your's was immediately prior to the patches. Not so? > Its always a good idea to make a new branch before you change anything > (especially if you in the master branch). Branches are cheap in git, > very useful, and easy to manipulate. > > > Also do I still need an RMII patch as before? > > http://linux.omap.com/pipermail/davinci-linux-open-source/2009- > March/012198.html > > No. You only need to add the writethru patch and it should compile > cleanly and run. > > > I see that the latest patches have "EMAC_VERSION_2" but no rmii_en > setting. Although it doesn't look like my boot sequence is getting far > enough for this to matter. > > It isn't. You'll have console output before you run into network issues. Thanks and regards, Martin > Mark > -- _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
