mbox

[U-Boot] Please pull u-boot-fsl-qoriq master

Message ID 565CA451.7060303@freescale.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-fsl-qoriq.git master

Message

York Sun Nov. 30, 2015, 7:32 p.m. UTC 
Tom,

The following changes since commit fa8883a1e39a20e72aaa5093af0c80062cb95757:

  Merge branch 'master' of git://git.denx.de/u-boot-i2c (2015-11-27 08:41:03 -0500)

are available in the git repository at:


  git://git.denx.de/u-boot-fsl-qoriq.git master

for you to fetch changes up to 3785f57015dbd7582f85fd1c34dcaa26638bf976:

  armv8: fsl-layerscape: Fix early MMU table for nand boot (2015-11-30 09:11:13
-0800)

----------------------------------------------------------------
Alison Wang (5):
      arm: ls1021a: Ensure LS1021 ARM Generic Timer CompareValue Set 64-bit
      arm: ls1021a: Ensure Generic Timer disabled before jumping into the OS
      armv8/layerscape: Update MMU table with execute-never bits
      arm: ls102xa: Update fdt_high and initrd_high for LS1021AQDS board
      armv8: ls2080a: Define CONFIG_ENV_OVERWRITE to overwrite serial and ethaddr

Gong Qianyu (5):
      armv8/fsl-layerscape: Remove reference to gdata
      armv8/ls1043ardb: dts: add dtb support
      armv8/ls1043aqds: dts: add dtb support
      armv8/ls1043ardb: add DSPI support
      armv8/ls1043ardb: add USB support

Mingkai Hu (1):
      pci/layerscape: add support for LS1043A PCIe LUT register access

Prabhakar Kushwaha (15):
      armv8: lsch3: Fix lane protocol parsing logic
      driver: net: fsl-mc: Add create, destroy APIs in flibs
      driver: net: fsl-mc: Add APIs for DPMAC objects in FLIB
      armv8: ls2085aqds: Print function name during SerDes error
      driver: ldpaa: Add api to return linked PHY ID of DPMAC
      driver: net: fsl-mc: Increase MC command timeout
      driver: net: fsl-mc: Add DPAA2 commands to manage MC
      driver: net: fsl-mc: Create DPAA2 object at run-time
      driver: net: ldpaa: Use DPMAC as net device
      driver: net: ldpaa: Add debug information
      driver: net: ldpaa: Fix Rx buffer alignment
      armv8: LS2080A: Rename LS2085A to reflect LS2080A
      armv8: ls2085a: Add support of LS2085A SoC
      board/ls2080qds: Fix typo in README for QSGMII riser card
      armv8: ls2085a: Add workaround of errata A009635

Shaohui Xie (2):
      armv8/ls1043aqds: add LS1043AQDS board support
      net: phy: added aquantia PHY AQR405 support

York Sun (4):
      drivers/ddr/fsl: Enable detection of one DDR controller operation for LSCH3
      drivers/ddr/fsl: Fix typo in BIST test for DDR4
      armv8: fsl-layerscape: Fix "cpu release" command
      armv8: fsl-layerscape: Fix early MMU table for nand boot

 README                                             |    3 +
 arch/arm/Kconfig                                   |   53 +-
 arch/arm/cpu/armv7/ls102xa/cpu.c                   |   10 +
 arch/arm/cpu/armv7/ls102xa/timer.c                 |    3 +-
 arch/arm/cpu/armv8/cache_v8.c                      |    4 +-
 arch/arm/cpu/armv8/fsl-layerscape/Makefile         |   10 +-
 arch/arm/cpu/armv8/fsl-layerscape/README.lsch3     |   85 ++-
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c            |   10 +-
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c            |    2 +-
 .../cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c    |   25 +-
 .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c |   11 +
 .../{ls2085a_serdes.c => ls2080a_serdes.c}         |    5 +
 arch/arm/cpu/armv8/fsl-layerscape/mp.c             |    6 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c            |   45 +-
 arch/arm/cpu/armv8/fsl-layerscape/spl.c            |    6 +-
 arch/arm/dts/Makefile                              |    6 +-
 arch/arm/dts/fsl-ls1043a-qds.dts                   |  124 +++
 arch/arm/dts/fsl-ls1043a-rdb.dts                   |  103 +++
 arch/arm/dts/fsl-ls1043a.dtsi                      |  186 +++++
 .../{fsl-ls2085a-qds.dts => fsl-ls2080a-qds.dts}   |    8 +-
 .../{fsl-ls2085a-rdb.dts => fsl-ls2080a-rdb.dts}   |    8 +-
 .../arm/dts/{fsl-ls2085a.dtsi => fsl-ls2080a.dtsi} |    4 +-
 arch/arm/include/asm/arch-fsl-layerscape/config.h  |   26 +-
 arch/arm/include/asm/arch-fsl-layerscape/cpu.h     |   87 ++-
 arch/arm/include/asm/arch-fsl-layerscape/fdt.h     |    1 +
 .../include/asm/arch-fsl-layerscape/fsl_serdes.h   |    2 +-
 .../include/asm/arch-fsl-layerscape/immap_lsch2.h  |   10 +-
 .../include/asm/arch-fsl-layerscape/immap_lsch3.h  |   10 +-
 .../{ls2085a_stream_id.h => ls2080a_stream_id.h}   |    4 +-
 arch/arm/include/asm/arch-fsl-layerscape/soc.h     |   11 +
 arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h  |    2 +-
 arch/arm/include/asm/armv8/mmu.h                   |    2 +-
 arch/arm/include/asm/global_data.h                 |    2 +-
 board/freescale/common/vid.c                       |   22 +
 board/freescale/ls1043aqds/Kconfig                 |   15 +
 board/freescale/ls1043aqds/MAINTAINERS             |    9 +
 board/freescale/ls1043aqds/Makefile                |    9 +
 board/freescale/ls1043aqds/README                  |   96 +++
 board/freescale/ls1043aqds/ddr.c                   |  131 ++++
 board/freescale/ls1043aqds/ddr.h                   |   60 ++
 board/freescale/ls1043aqds/eth.c                   |  492 ++++++++++++
 board/freescale/ls1043aqds/ls1043aqds.c            |  333 ++++++++
 board/freescale/ls1043aqds/ls1043aqds_pbi.cfg      |   14 +
 board/freescale/ls1043aqds/ls1043aqds_qixis.h      |   39 +
 board/freescale/ls1043aqds/ls1043aqds_rcw_nand.cfg |    7 +
 .../freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg |    8 +
 board/freescale/ls1043ardb/ls1043ardb.c            |   16 +
 board/freescale/{ls2085a => ls2080a}/Kconfig       |   12 +-
 board/freescale/ls2080a/MAINTAINERS                |   10 +
 board/freescale/ls2080a/Makefile                   |    8 +
 board/freescale/{ls2085a => ls2080a}/README        |    2 +-
 board/freescale/{ls2085a => ls2080a}/ddr.c         |    3 +-
 board/freescale/{ls2085a => ls2080a}/ddr.h         |    0
 .../{ls2085a/ls2085a.c => ls2080a/ls2080a.c}       |    2 +
 board/freescale/{ls2085ardb => ls2080aqds}/Kconfig |    6 +-
 board/freescale/ls2080aqds/MAINTAINERS             |   10 +
 .../freescale/{ls2085aqds => ls2080aqds}/Makefile  |    2 +-
 board/freescale/{ls2085aqds => ls2080aqds}/README  |   18 +-
 board/freescale/{ls2085ardb => ls2080aqds}/ddr.c   |    5 +-
 board/freescale/{ls2085aqds => ls2080aqds}/ddr.h   |    0
 board/freescale/{ls2085aqds => ls2080aqds}/eth.c   |  108 +--
 .../ls2085aqds.c => ls2080aqds/ls2080aqds.c}       |    9 +-
 .../ls2080aqds_qixis.h}                            |    0
 board/freescale/{ls2085aqds => ls2080ardb}/Kconfig |    6 +-
 board/freescale/ls2080ardb/MAINTAINERS             |   10 +
 .../freescale/{ls2085ardb => ls2080ardb}/Makefile  |    2 +-
 board/freescale/{ls2085ardb => ls2080ardb}/README  |   12 +-
 board/freescale/{ls2085aqds => ls2080ardb}/ddr.c   |    5 +-
 board/freescale/{ls2085ardb => ls2080ardb}/ddr.h   |    0
 .../eth_ls2085rdb.c => ls2080ardb/eth_ls2080rdb.c} |    2 +-
 .../ls2085ardb.c => ls2080ardb/ls2080ardb.c}       |    9 +-
 .../ls2080ardb_qixis.h}                            |    0
 board/freescale/ls2085a/MAINTAINERS                |    8 -
 board/freescale/ls2085a/Makefile                   |    8 -
 board/freescale/ls2085aqds/MAINTAINERS             |    8 -
 board/freescale/ls2085ardb/MAINTAINERS             |    8 -
 configs/ls1043aqds_defconfig                       |    6 +
 configs/ls1043aqds_nand_defconfig                  |    5 +
 configs/ls1043aqds_nor_ddr3_defconfig              |    3 +
 configs/ls1043aqds_sdcard_ifc_defconfig            |    5 +
 configs/ls1043ardb_defconfig                       |    5 +
 configs/ls1043ardb_nand_defconfig                  |    5 +
 configs/ls1043ardb_sdcard_defconfig                |    5 +
 configs/ls2080a_emu_defconfig                      |   15 +
 configs/ls2080a_simu_defconfig                     |   16 +
 configs/ls2080aqds_defconfig                       |   15 +
 configs/ls2080aqds_nand_defconfig                  |    9 +
 configs/ls2080ardb_defconfig                       |   15 +
 configs/ls2080ardb_nand_defconfig                  |    9 +
 configs/ls2085a_emu_defconfig                      |    4 +-
 configs/ls2085a_simu_defconfig                     |    4 +-
 configs/ls2085aqds_defconfig                       |    6 +-
 configs/ls2085aqds_nand_defconfig                  |    4 +-
 configs/ls2085ardb_defconfig                       |    6 +-
 configs/ls2085ardb_nand_defconfig                  |    4 +-
 doc/README.fsl-trustzone-components                |    4 +-
 drivers/ddr/fsl/fsl_ddr_gen4.c                     |   28 +-
 drivers/ddr/fsl/main.c                             |    1 +
 drivers/ddr/fsl/util.c                             |   40 +
 drivers/net/fsl-mc/Makefile                        |    3 +-
 drivers/net/fsl-mc/dpbp.c                          |   41 +
 drivers/net/fsl-mc/dpio/dpio.c                     |   40 +
 drivers/net/fsl-mc/dpmac.c                         |  222 ++++++
 drivers/net/fsl-mc/dpni.c                          |   40 +
 drivers/net/fsl-mc/dprc.c                          |   46 ++
 drivers/net/fsl-mc/mc.c                            |  800 +++++++++++++++-----
 drivers/net/fsl-mc/mc_sys.c                        |    2 +-
 drivers/net/ldpaa_eth/Makefile                     |    3 +-
 drivers/net/ldpaa_eth/ldpaa_eth.c                  |  295 +++++++-
 drivers/net/ldpaa_eth/ldpaa_eth.h                  |   23 +-
 drivers/net/ldpaa_eth/ldpaa_wriop.c                |   27 +-
 drivers/net/ldpaa_eth/{ls2085a.c => ls2080a.c}     |    0
 drivers/net/phy/aquantia.c                         |   15 +
 drivers/pci/pcie_layerscape.c                      |   16 +-
 include/configs/ls1021aqds.h                       |    8 +-
 include/configs/ls1043aqds.h                       |  387 ++++++++++
 include/configs/ls1043ardb.h                       |   23 +
 .../configs/{ls2085a_common.h => ls2080a_common.h} |   16 +-
 include/configs/{ls2085a_emu.h => ls2080a_emu.h}   |   11 +-
 include/configs/{ls2085a_simu.h => ls2080a_simu.h} |   11 +-
 include/configs/{ls2085aqds.h => ls2080aqds.h}     |   16 +-
 include/configs/{ls2085ardb.h => ls2080ardb.h}     |   16 +-
 include/fsl-mc/fsl_dpbp.h                          |   48 ++
 include/fsl-mc/fsl_dpio.h                          |   60 ++
 include/fsl-mc/fsl_dpmac.h                         |  468 ++++++++++++
 include/fsl-mc/fsl_dpni.h                          |  189 +++++
 include/fsl-mc/fsl_dprc.h                          |   84 ++
 include/fsl-mc/fsl_mc.h                            |   10 +-
 include/fsl-mc/fsl_mc_private.h                    |   26 +-
 include/fsl-mc/ldpaa_wriop.h                       |    3 +-
 include/fsl_ddr.h                                  |    1 +
 include/linux/usb/xhci-fsl.h                       |   15 +-
 132 files changed, 5021 insertions(+), 556 deletions(-)
 rename arch/arm/cpu/armv8/fsl-layerscape/{ls2085a_serdes.c => ls2080a_serdes.c}
(96%)
 create mode 100644 arch/arm/dts/fsl-ls1043a-qds.dts
 create mode 100644 arch/arm/dts/fsl-ls1043a-rdb.dts
 create mode 100644 arch/arm/dts/fsl-ls1043a.dtsi
 rename arch/arm/dts/{fsl-ls2085a-qds.dts => fsl-ls2080a-qds.dts} (80%)
 rename arch/arm/dts/{fsl-ls2085a-rdb.dts => fsl-ls2080a-rdb.dts} (67%)
 rename arch/arm/dts/{fsl-ls2085a.dtsi => fsl-ls2080a.dtsi} (97%)
 rename arch/arm/include/asm/arch-fsl-layerscape/{ls2085a_stream_id.h =>
ls2080a_stream_id.h} (93%)
 create mode 100644 board/freescale/ls1043aqds/Kconfig
 create mode 100644 board/freescale/ls1043aqds/MAINTAINERS
 create mode 100644 board/freescale/ls1043aqds/Makefile
 create mode 100644 board/freescale/ls1043aqds/README
 create mode 100644 board/freescale/ls1043aqds/ddr.c
 create mode 100644 board/freescale/ls1043aqds/ddr.h
 create mode 100644 board/freescale/ls1043aqds/eth.c
 create mode 100644 board/freescale/ls1043aqds/ls1043aqds.c
 create mode 100644 board/freescale/ls1043aqds/ls1043aqds_pbi.cfg
 create mode 100644 board/freescale/ls1043aqds/ls1043aqds_qixis.h
 create mode 100644 board/freescale/ls1043aqds/ls1043aqds_rcw_nand.cfg
 create mode 100644 board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg
 rename board/freescale/{ls2085a => ls2080a}/Kconfig (66%)
 create mode 100644 board/freescale/ls2080a/MAINTAINERS
 create mode 100644 board/freescale/ls2080a/Makefile
 rename board/freescale/{ls2085a => ls2080a}/README (97%)
 rename board/freescale/{ls2085a => ls2080a}/ddr.c (99%)
 rename board/freescale/{ls2085a => ls2080a}/ddr.h (100%)
 rename board/freescale/{ls2085a/ls2085a.c => ls2080a/ls2080a.c} (98%)
 rename board/freescale/{ls2085ardb => ls2080aqds}/Kconfig (67%)
 create mode 100644 board/freescale/ls2080aqds/MAINTAINERS
 rename board/freescale/{ls2085aqds => ls2080aqds}/Makefile (83%)
 rename board/freescale/{ls2085aqds => ls2080aqds}/README (95%)
 rename board/freescale/{ls2085ardb => ls2080aqds}/ddr.c (98%)
 rename board/freescale/{ls2085aqds => ls2080aqds}/ddr.h (100%)
 rename board/freescale/{ls2085aqds => ls2080aqds}/eth.c (86%)
 rename board/freescale/{ls2085aqds/ls2085aqds.c => ls2080aqds/ls2080aqds.c} (98%)
 rename board/freescale/{ls2085aqds/ls2085aqds_qixis.h =>
ls2080aqds/ls2080aqds_qixis.h} (100%)
 rename board/freescale/{ls2085aqds => ls2080ardb}/Kconfig (67%)
 create mode 100644 board/freescale/ls2080ardb/MAINTAINERS
 rename board/freescale/{ls2085ardb => ls2080ardb}/Makefile (72%)
 rename board/freescale/{ls2085ardb => ls2080ardb}/README (94%)
 rename board/freescale/{ls2085aqds => ls2080ardb}/ddr.c (98%)
 rename board/freescale/{ls2085ardb => ls2080ardb}/ddr.h (100%)
 rename board/freescale/{ls2085ardb/eth_ls2085rdb.c =>
ls2080ardb/eth_ls2080rdb.c} (98%)
 rename board/freescale/{ls2085ardb/ls2085ardb.c => ls2080ardb/ls2080ardb.c} (97%)
 rename board/freescale/{ls2085ardb/ls2085ardb_qixis.h =>
ls2080ardb/ls2080ardb_qixis.h} (100%)
 delete mode 100644 board/freescale/ls2085a/MAINTAINERS
 delete mode 100644 board/freescale/ls2085a/Makefile
 delete mode 100644 board/freescale/ls2085aqds/MAINTAINERS
 delete mode 100644 board/freescale/ls2085ardb/MAINTAINERS
 create mode 100644 configs/ls1043aqds_defconfig
 create mode 100644 configs/ls1043aqds_nand_defconfig
 create mode 100644 configs/ls1043aqds_nor_ddr3_defconfig
 create mode 100644 configs/ls1043aqds_sdcard_ifc_defconfig
 create mode 100644 configs/ls2080a_emu_defconfig
 create mode 100644 configs/ls2080a_simu_defconfig
 create mode 100644 configs/ls2080aqds_defconfig
 create mode 100644 configs/ls2080aqds_nand_defconfig
 create mode 100644 configs/ls2080ardb_defconfig
 create mode 100644 configs/ls2080ardb_nand_defconfig
 create mode 100644 drivers/net/fsl-mc/dpmac.c
 rename drivers/net/ldpaa_eth/{ls2085a.c => ls2080a.c} (100%)
 create mode 100644 include/configs/ls1043aqds.h
 rename include/configs/{ls2085a_common.h => ls2080a_common.h} (97%)
 rename include/configs/{ls2085a_emu.h => ls2080a_emu.h} (92%)
 rename include/configs/{ls2085a_simu.h => ls2080a_simu.h} (95%)
 rename include/configs/{ls2085aqds.h => ls2080aqds.h} (96%)
 rename include/configs/{ls2085ardb.h => ls2080ardb.h} (96%)
 create mode 100644 include/fsl-mc/fsl_dpmac.h

Thanks.

York

Comments

Tom Rini Dec. 1, 2015, 1:37 a.m. UTC | #1 
On Mon, Nov 30, 2015 at 11:32:33AM -0800, York Sun wrote:

> Tom,
> 
> The following changes since commit fa8883a1e39a20e72aaa5093af0c80062cb95757:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-i2c (2015-11-27 08:41:03 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-fsl-qoriq.git master
> 
> for you to fetch changes up to 3785f57015dbd7582f85fd1c34dcaa26638bf976:
> 
>   armv8: fsl-layerscape: Fix early MMU table for nand boot (2015-11-30 09:11:13
> -0800)
> 

Applied to u-boot/master, thanks!