[U-Boot] ARM Pull Request for next

[Wolfgang Denk]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <20090515202302.GK16288 at game.jcrosoft.org> you wrote:
> Hi Wolfgang
> 
> Please pull
> The following changes since commit f8ddcd58221cab63dd25c2324dd2032487f748b1:
>   Graf Yang (1):
>         Blackfin: bf518f-ezbrd: reset ethernet PHY during init
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-arm.git next
> 
> David Brownell (10):
>       DaVinci Ethernet cleanup
>       DaVinci now respects SKIP_LOWLEVEL_INIT
>       davinci: move psc support board-->cpu
>       davinci: cpu-specific build uses conditional make syntax
>       davinci: split out some dm644x-specific bits from psc
>       davinci: fix dm644x buglets
>       davinci: add basic dm355/dm350/dm335 support
>       davinci: display correct clock info
>       davinci dm6446evm NAND update
>       dm355 evm support
> 
> Jean-Christophe PLAGNIOL-VILLARD (12):
>       arm946es: remove non used timer
>       arm: cleanup remaining CONFIG_INIT_CRITICAL
>       ixp/interrupts: Move conditional compilation to Makefile
>       at91rm9200: move reset code to reset.c
>       OMAP3: Remove dublicated interrupt code
>       OMAP3: Reorganize Makefile style
>       arm: timer and interrupt init rework
>       arm920/926/926: remove non needed header
>       ARM: Update mach-types
>       arm/dcc: use static support to allow to use it at anytime
>       arm/dcc: add xscale support
>       at91: regroup IP hw init in one file per soc
> 
> Sandeep Paulraj (1):
>       ARM DaVinci:Consolidate common u-boot.lds
> 
> Sanjeev Premi (1):
>       OMAP3EVM: Set default bootfile
> 
> Tom Rix (7):
>       ARM Add blue colour LED to status_led.
>       LED Add documentation describing the status_led and colour led API.
>       ZOOM1 Remove more legacy NAND defines.
>       OMAP Consolidate common u-boot.lds to cpu layer.
>       ZOOM2 Add initial support for Zoom2
>       OMAP3 Port kernel omap gpio interface.
>       ZOOM2 Add support for debug board detection.
> 
> s-paulraj at ti.com (1):
>       ARM DaVinci: Minor Updates to base addresses

Sorry, this tree does not apply cleanly to the current "next" branch:

...
CONFLICT (delete/modify): board/davinci/schmoogie/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/davinci/schmoogie/u-boot.lds left in tree.
CONFLICT (delete/modify): board/davinci/sffsdr/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/davinci/sffsdr/u-boot.lds left in tree.
CONFLICT (delete/modify): board/davinci/sonata/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/davinci/sonata/u-boot.lds left in tree.
CONFLICT (delete/modify): board/omap3/beagle/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/omap3/beagle/u-boot.lds left in tree.
CONFLICT (delete/modify): board/omap3/evm/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/omap3/evm/u-boot.lds left in tree.
CONFLICT (delete/modify): board/omap3/overo/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/omap3/overo/u-boot.lds left in tree.
CONFLICT (delete/modify): board/omap3/pandora/u-boot.lds deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of board/omap3/pandora/u-boot.lds left in tree.
...
CONFLICT (delete/modify): cpu/arm926ejs/at91/at91sam9260_macb.c deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of cpu/arm926ejs/at91/at91sam9260_macb.c left in tree.
...
CONFLICT (delete/modify): cpu/arm926ejs/interrupts.c deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of cpu/arm926ejs/interrupts.c left in tree.
...
CONFLICT (delete/modify): cpu/arm946es/interrupts.c deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of cpu/arm946es/interrupts.c left in tree.
...
CONFLICT (delete/modify): cpu/arm_cortexa8/omap3/interrupts.c deleted in fc7f767e037b8d6bc753447a502d551d39f0c774 and modified in HEAD. Version HEAD of cpu/arm_cortexa8/omap3/interrupts.c left in tree.
...
Automatic merge failed; fix conflicts and then commit the result.


Please clean up & rebase your tree and submit a new pull request.

Thanks.

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
The universe, they said, depended for its operation on the balance of
four forces which they identified as charm,  persuasion,  uncertainty
and bloody-mindedness.      -- Terry Pratchett, "The Light Fantastic"