From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 25 Nov 2014 16:52:51 -0500 Subject: [U-Boot] Please pull u-boot-sunxi master In-Reply-To: References: <547479D6.8060503@redhat.com> Message-ID: <20141125215251.GA20704@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 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. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: