[U-Boot] Please pull u-boot-x86 branch 'sandbox'

[Simon Glass]

Hi Tom,

On 19 April 2015 at 12:28, Tom Rini <trini at konsulko.com> wrote:
> On Sun, Apr 19, 2015 at 07:23:08AM -0600, Simon Glass wrote:
>
>> Hi Tom,
>>
>> Here are the queued sandbox changes, to allow sandbox to use the
>> distro booting feature.
>>
>>
>> The following changes since commit 5ab83ec1a13601c4f76ce009afe0d1ee51f1ad9c:
>>
>>   sandbox: exynos: Move CONFIG_SOUND_SANDBOX to Kconfig (2015-04-13
>> 20:53:47 -0600)
>>
>> are available in the git repository at:
>>
>>   http://git.denx.de/u-boot-x86.git
>>
>> for you to fetch changes up to 71beb9b91d691a045220b3092f3363b1f0cf833a:
>>
>>   sandbox: add config_distro_defaults and config_distro_bootcmd
>> (2015-04-18 16:27:13 -0600)
>>
>
> This conflicts pretty badly now for some reason:
> # Unmerged paths:
> #   (use "git add/rm <file>..." as appropriate to mark resolution)
> #
> #       both modified:      Makefile
> #       both modified:      arch/arm/dts/exynos5420-peach-pit.dts
> #       both modified:      arch/arm/dts/exynos5800-peach-pi.dts
> #       both modified:      arch/arm/mach-bcm283x/Kconfig
> #       both modified:      arch/sandbox/cpu/cpu.c
> #       both modified:      arch/sandbox/lib/Makefile
> #       both modified:      common/usb.c
> #       both modified:      common/usb_storage.c
> #       both modified:      drivers/usb/host/ehci-hcd.c
> #       both modified:      include/configs/sandbox.h
>
> Can you please rebase and resend?  Thanks!

Will do - I'll wait until master is updated.

Regards,
Simon