mbox

[U-Boot] Please pull u-boot-sunxi master (bugfix for v2015.07)

Message ID 559D393B.5000102@redhat.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

http://git.denx.de/u-boot-sunxi.git master

Message

Hans de Goede July 8, 2015, 2:52 p.m. UTC
Hi Tom,

One of the sunxi dts files for a new board got merged into the
upstream kernel under a different name than that it was originally
submitted with. This pull-req contains a single patch adjusting
the name in u-boot, so that we do not end up shipping a u-boot
which looks for a differently named .dtb file then the kernel
ships with.

The following changes since commit 0a888f584c48984cb9657a5d42dc994b33c264a7:

   ARM: DRA72x: fix io delay calibration for ethernet (2015-07-07 20:15:52 -0400)

are available in the git repository at:

   http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to 8fa2e20913183133998cbbb78a5184bd20ccfcbe:

   sunxi: Adjust Ippo_q8h_v1_2_a33_1024x600 dts filename to match the upstream kernel (2015-07-08 16:21:27 +0200)

----------------------------------------------------------------
Hans de Goede (1):
       sunxi: Adjust Ippo_q8h_v1_2_a33_1024x600 dts filename to match the upstream kernel

  arch/arm/dts/Makefile                                                   | 2 +-
  ...8i-a33-ippo-q8h-v1.2-lcd1024x600.dts => sun8i-a33-ippo-q8h-v1.2.dts} | 0
  configs/Ippo_q8h_v1_2_a33_1024x600_defconfig                            | 2 +-
  3 files changed, 2 insertions(+), 2 deletions(-)
  rename arch/arm/dts/{sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dts => sun8i-a33-ippo-q8h-v1.2.dts} (100%)

Regards,

Hans

Comments

Tom Rini July 8, 2015, 5:32 p.m. UTC | #1
On Wed, Jul 08, 2015 at 04:52:43PM +0200, Hans de Goede wrote:

> Hi Tom,
> 
> One of the sunxi dts files for a new board got merged into the
> upstream kernel under a different name than that it was originally
> submitted with. This pull-req contains a single patch adjusting
> the name in u-boot, so that we do not end up shipping a u-boot
> which looks for a differently named .dtb file then the kernel
> ships with.
> 
> The following changes since commit 0a888f584c48984cb9657a5d42dc994b33c264a7:
> 
>   ARM: DRA72x: fix io delay calibration for ethernet (2015-07-07 20:15:52 -0400)
> 
> are available in the git repository at:
> 
>   http://git.denx.de/u-boot-sunxi.git master
> 
> for you to fetch changes up to 8fa2e20913183133998cbbb78a5184bd20ccfcbe:
> 
>   sunxi: Adjust Ippo_q8h_v1_2_a33_1024x600 dts filename to match the upstream kernel (2015-07-08 16:21:27 +0200)
> 

Applied to u-boot/master, thanks!