[U-Boot] [PATCH RFC] mcf5307 support

[Wolfgang Denk]

Dear angelo,

In message <4E37B3E7.60108 at gmail.com> you wrote:
> 
> 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

So you have modified files in your tree...

> I don't understand why the Makefile cannot be merged, i just added 2 
> lines with the target for my custom board.

It could probably be merged, if you had used a "git merge" command.
You did not, you used "git checkout", which performs a checkout of a
specific version in the git repository.

Best regards,

Wolfgang Denk

-- 
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
"Faith: not *wanting* to know what is true."    - Friedrich Nietzsche