mbox

[U-Boot] pull request: u-boot-uniphier/master

Message ID CAK7LNARdNkz6Tq0Js+a+-nsnVtNc2BZjL100fSJfs9QHCkFSjg@mail.gmail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-uniphier.git master

Message

Masahiro Yamada Dec. 11, 2016, 9:04 a.m. UTC
Hi Tom,

Please pull some updates for v2017.01-rc2, thanks!
  - DT sync with Linux
  - Disable CONFIG_ARCH_FIXUP_FDT_MEMORY
  - Minor fixes

The following changes since commit 361a879902a3cbdb692149a1ac580e3199e771ba:

  Revert "Merge branch 'master' of
git://www.denx.de/git/u-boot-microblaze" (2016-12-09 07:56:54 -0500)

are available in the git repository at:

  git://git.denx.de/u-boot-uniphier.git master

for you to fetch changes up to 6c498835af560ad850de4dad4ff8c60d26ef2898:

  ARM: uniphier: remove BLK select (2016-12-11 17:55:13 +0900)

----------------------------------------------------------------
Masahiro Yamada (5):
      ARM: uniphier: remove unneeded initializer
      ARM: uniphier: remove unneeded parentheses
      ARM: uniphier: disable CONFIG_ARCH_FIXUP_FDT_MEMORY
      ARM: dts: uniphier: sync Device Tree with Linux
      ARM: uniphier: remove BLK select

 arch/arm/Kconfig                         |   1 -
 arch/arm/dts/uniphier-common32.dtsi      | 177 ------
 arch/arm/dts/uniphier-ld11.dtsi          | 111 +++-
 arch/arm/dts/uniphier-ld20.dtsi          | 188 +++++--
 arch/arm/dts/uniphier-ld4.dtsi           | 651 +++++++++++++---------
 arch/arm/dts/uniphier-pro4-ref.dts       |  10 +-
 arch/arm/dts/uniphier-pro4.dtsi          | 903 +++++++++++++++++-------------
 arch/arm/dts/uniphier-pro5.dtsi          | 925 +++++++++++++++++++------------
 arch/arm/dts/uniphier-pxs2-gentil.dts    |   2 +-
 arch/arm/dts/uniphier-pxs2-vodka.dts     |   2 +-
 arch/arm/dts/uniphier-pxs2.dtsi          | 878 +++++++++++++++++------------
 arch/arm/dts/uniphier-sld3.dtsi          |  37 +-
 arch/arm/dts/uniphier-sld8.dtsi          | 651 +++++++++++++---------
 arch/arm/mach-uniphier/dram/umc-ld20.c   |   6 +-
 arch/arm/mach-uniphier/memconf/memconf.c |   6 +-
 configs/uniphier_ld11_defconfig          |   1 +
 configs/uniphier_ld20_defconfig          |   1 +
 configs/uniphier_ld4_sld8_defconfig      |   1 +
 configs/uniphier_pro4_defconfig          |   1 +
 configs/uniphier_pxs2_ld6b_defconfig     |   1 +
 configs/uniphier_sld3_defconfig          |   1 +
 21 files changed, 2697 insertions(+), 1857 deletions(-)
 delete mode 100644 arch/arm/dts/uniphier-common32.dtsi

Comments

Tom Rini Dec. 12, 2016, 3:55 p.m. UTC | #1
On Sun, Dec 11, 2016 at 06:04:19PM +0900, Masahiro Yamada wrote:

> Hi Tom,
> 
> Please pull some updates for v2017.01-rc2, thanks!
>   - DT sync with Linux
>   - Disable CONFIG_ARCH_FIXUP_FDT_MEMORY
>   - Minor fixes
> 
> The following changes since commit 361a879902a3cbdb692149a1ac580e3199e771ba:
> 
>   Revert "Merge branch 'master' of
> git://www.denx.de/git/u-boot-microblaze" (2016-12-09 07:56:54 -0500)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-uniphier.git master
> 
> for you to fetch changes up to 6c498835af560ad850de4dad4ff8c60d26ef2898:
> 
>   ARM: uniphier: remove BLK select (2016-12-11 17:55:13 +0900)
> 

Applied to u-boot/master, thanks!