Dear Bartek,
in message 47E4D565.105@semihalf.com you wrote:
Support for the new uImage format is available in the git repository at:
git://www.denx.de/git/u-boot-testing.git new-imageThe branch contains all patches related to the new uImage development that have been posted to the list.
Sorry, but can you please rebase your patches against current HEAD?
I get merge conflicts:
-> git-pull git://www.denx.de/git/u-boot-testing.git new-image remote: Counting objects: 1039, done. remote: Compressing objects: 100% (275/275), done. remote: Total 887 (delta 758), reused 714 (delta 609) Receiving objects: 100% (887/887), 206.94 KiB, done. Resolving deltas: 100% (758/758), completed with 115 local objects. Auto-merged Makefile Auto-merged README Auto-merged board/cray/L1/L1.c Auto-merged common/Makefile Auto-merged common/cmd_bootm.c CONFLICT (content): Merge conflict in common/cmd_bootm.c Auto-merged cpu/mpc5xxx/cpu.c Auto-merged cpu/mpc8xx/cpu.c CONFLICT (content): Merge conflict in cpu/mpc8xx/cpu.c Auto-merged fs/cramfs/uncompress.c Auto-merged include/common.h Auto-merged include/libfdt.h Removed lib_i386/i386_linux.c Removed lib_m68k/m68k_linux.c Removed lib_microblaze/microblaze_linux.c Auto-merged libfdt/fdt.c Auto-merged libfdt/fdt_ro.c Auto-merged libfdt/fdt_rw.c Automatic merge failed; fix conflicts and then commit the result.
Please fix.
Best regards,
Wolfgang Denk