From: angelo <angelo70@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH RFC] mcf5307 support
Date: Tue, 02 Aug 2011 10:23:03 +0200 [thread overview]
Message-ID: <4E37B3E7.60108@gmail.com> (raw)
In-Reply-To: <20110801213629.508A9177A79D@gemini.denx.de>
Hi Wolfgang,
thanks for the help,
I changed url using git, but i still have an issue:
angelo at angel7:~/sysam/amcore/u-boot.git$ git checkout master
M Makefile
A arch/m68k/cpu/mcf530x/Makefile
A arch/m68k/cpu/mcf530x/config.mk
A arch/m68k/cpu/mcf530x/cpu.c
A arch/m68k/cpu/mcf530x/cpu.h
A arch/m68k/cpu/mcf530x/cpu_init.c
A arch/m68k/cpu/mcf530x/interrupts.c
A arch/m68k/cpu/mcf530x/speed.c
A arch/m68k/cpu/mcf530x/start.S
M arch/m68k/include/asm/cache.h
M arch/m68k/include/asm/immap.h
M arch/m68k/include/asm/timer.h
M boards.cfg
M include/common.h
M include/flash.h
Already on 'master'
Your branch is behind 'origin/master' by 331 commits, and can be
fast-forwarded.
angelo at angel7:~/sysam/amcore/u-boot.git$ git pull
git://git.denx.de/u-boot.git master
From git://git.denx.de/u-boot
* branch master -> FETCH_HEAD
Updating 6f4dd40..33a6b9e
error: Your local changes to 'Makefile' would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
angelo at angel7:~/sysam/amcore/u-boot.git$
I don't understand why the Makefile cannot be merged, i just added 2
lines with the target for my custom board.
Thanks
angelo
On 01/08/2011 23:36, Wolfgang Denk wrote:
> Dear angelo,
>
> In message<4E371771.8000902@gmail.com> you wrote:
>
>> seems i cannot "git pull" anymore, i am getting an error:
>>
>> xu at angel7:~/u-boot.git$ git pull
>> error: Unable to find dbf545f2d11cd3118c6c8b54122adfbe799ea1b8 under
>> http://git.denx.de/u-boot.git
>> Cannot obtain needed blob dbf545f2d11cd3118c6c8b54122adfbe799ea1b8
>> while processing commit e6a857da746d5d7d450e59c0f86664c6b279b1c2.
>> error: Fetch failed.
>> xu at angel7:~/u-boot.git$
>>
> You should try unsing git protocol instead of HTTP. Also, make sure
> to use a recent version of git.
>
>
>> Is there a way to generate the patch comparing my local tree with a new
>> "git clone" u-boot folder ?
>>
> You can export your patches using "git format-patch" and then re-apply
> these to a (branch in) a fresh clone of the master repo.
>
>
>> Or otherwise, since i cannot "pull", what would be the correct procedure
>> for the patch now ?
>>
> In the first step, fix this pull problem.
>
> Best regards,
>
> Wolfgang Denk
>
>
<http://www.sysam.it>
next prev parent reply other threads:[~2011-08-02 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-01 21:15 [U-Boot] [PATCH RFC] mcf5307 support angelo
2011-08-01 21:36 ` Wolfgang Denk
2011-08-02 8:23 ` angelo [this message]
2011-08-02 13:32 ` Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E37B3E7.60108@gmail.com \
--to=angelo70@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.