[U-Boot] Please pull u-boot-sunxi master

[Hans de Goede]

Hi,

On 11/26/2014 05:25 PM, Tom Rini wrote:
> On Wed, Nov 26, 2014 at 10:20:44AM +0100, Hans de Goede wrote:
>> Hi,
>>
>> On 11/25/2014 10:52 PM, Tom Rini wrote:
>>> On Tue, Nov 25, 2014 at 10:52:21AM -0700, Simon Glass wrote:
>>>> Hi Tom,
>>>>
>>>> On 25 November 2014 at 05:45, Hans de Goede <hdegoede at redhat.com> wrote:
>>>>> Hi Tom,
>>>>>
>>>>> Please pull u-boot-sunxi/master into master, highlights:
>>>>>
>>>>> 1) hdmi console (with usb keyboard) support with simplefb support so the
>>>>> kernel
>>>>>     can use the framebuffer too
>>>>> 2) GMAC support for sun6i
>>>>> 3) A couple of small bugfixes
>>>>>
>>>>> Note I've done a rebase + forced-push, as things were becoming a bit messy
>>>>> while merging.
>>>>>
>>>>> The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb:
>>>>>
>>>>>    Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500)
>>>>>
>>>>> are available in the git repository at:
>>>>>
>>>>>    http://git.denx.de/u-boot-sunxi.git master
>>>>>
>>>>> for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c:
>>>>>
>>>>>    sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
>>>>> (2014-11-25 13:38:46 +0100)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> Hans de Goede (12):
>>>>>        sun4i: Rename dram_clk_cfg to dram_clk_gate
>>>>>        sunxi: Add video pll clock functions
>>>>>        sunxi: video: Add sun6i support
>>>>>        fdt_support: Add a fdt_setup_simplefb_node helper function
>>>>>        common/lcd: Make lcd_dt_simplefb_configure_node use
>>>>> fdt_setup_simplefb_node
>>>>>        sunxi: Add usb keyboard Kconfig option
>>>>>        sunxi: ahci: Add a delay after enabling target power
>>>>>        sun6i: Correct Mele M9 Vbus gpio settings
>>>>>        sun6i: Add gmac support for sun6i boards
>>>>>        sun6i: Drop some "unknown magic" from dram init
>>>>>        sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS
>>>>>        sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set
>>>>
>>>> The u-boot-fdt pull request is pending. I think it might have a slight
>>>> conflict with this one, so I'll wait until this goes in and then
>>>> resend the fdt pull request.
>>>
>>> I _think_ I resolved the conflict right.
>>
>> Hmm, I'm not seeing any changes if I do a "git remote update" did you perhaps
>> forget to push things ?
>
> Ah sorry.  To be clear, I was testing things at the time :)

Ah, ok. Thanks looks good now (have not tested it yet).

Regards,

Hans