[U-Boot] [PATCH v4] armv8: LS2080A: Consolidate LS2080A and LS2085A

[York Sun]

On 04/04/2016 11:41 AM, York Sun wrote:
> LS2080A is the primary SoC, and LS2085A is a personality with AIOP
> and DPAA DDR. The RDB and QDS boards support both personality. By
> detecting the SVR at runtime, a single image per board can support
> both SoCs. It gives users flexibility to swtich SoC without the need
> to reprogram the board.
> 
> Signed-off-by: York Sun <york.sun at nxp.com>
> CC: Prabhakar Kushwaha <prabhakar.kushwaha at nxp.com>
> 
> ---
> 
> Changes in v4:
> Rebase to latest master, add changes to secure boot
> Remove ls2085a related defconfig
> Add weak function for soc_has_aiop
> Compile tested on selected arm and powerpc targets
> 
> Changes in v3:
> Fix checking AIOP. Tested on LS2080ARDB.
> 
> Changes in v2:
> Add checking for SVR before starting AIOP
> Drop RFC from subject
> 
>  arch/arm/cpu/armv8/fsl-layerscape/Makefile         |    4 ---
>  arch/arm/cpu/armv8/fsl-layerscape/cpu.c            |    9 ++++---
>  .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c |    6 ++++-
>  arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S       |    2 +-
>  arch/arm/cpu/armv8/fsl-layerscape/soc.c            |   26 ++++++++++++++++++-
>  arch/arm/cpu/armv8/fsl-layerscape/spl.c            |    4 +--
>  arch/arm/include/asm/arch-fsl-layerscape/config.h  |    9 ++-----
>  arch/arm/include/asm/arch-fsl-layerscape/cpu.h     |    2 +-
>  .../include/asm/arch-fsl-layerscape/fsl_serdes.h   |    2 +-
>  arch/arm/include/asm/arch-fsl-layerscape/soc.h     |    3 +++
>  arch/arm/include/asm/fsl_secure_boot.h             |   12 ++++-----
>  board/freescale/ls2080a/MAINTAINERS                |    2 --
>  board/freescale/ls2080a/ddr.c                      |   27 +++++++++++---------
>  board/freescale/ls2080a/ls2080a.c                  |    2 +-
>  board/freescale/ls2080aqds/MAINTAINERS             |    3 ---
>  board/freescale/ls2080aqds/ddr.c                   |   27 +++++++++++---------
>  board/freescale/ls2080aqds/ls2080aqds.c            |    2 +-
>  board/freescale/ls2080ardb/MAINTAINERS             |    3 ---
>  board/freescale/ls2080ardb/ddr.c                   |   27 +++++++++++---------
>  board/freescale/ls2080ardb/ls2080ardb.c            |    2 +-
>  configs/ls2085a_emu_defconfig                      |   20 ---------------
>  configs/ls2085a_simu_defconfig                     |   21 ---------------
>  configs/ls2085aqds_SECURE_BOOT_defconfig           |   20 ---------------
>  configs/ls2085aqds_defconfig                       |   19 --------------
>  configs/ls2085aqds_nand_defconfig                  |   14 ----------
>  configs/ls2085ardb_SECURE_BOOT_defconfig           |   20 ---------------
>  configs/ls2085ardb_defconfig                       |   19 --------------
>  configs/ls2085ardb_nand_defconfig                  |   14 ----------
>  doc/device-tree-bindings/serial/8250.txt           |    2 +-
>  drivers/crypto/fsl/jr.c                            |    6 ++---
>  drivers/net/fsl-mc/mc.c                            |   10 ++++++++
>  drivers/net/ldpaa_eth/Makefile                     |    1 -
>  include/configs/ls2080a_common.h                   |    7 +----
>  include/configs/ls2080a_emu.h                      |    7 -----
>  include/configs/ls2080a_simu.h                     |    7 -----
>  include/linux/usb/xhci-fsl.h                       |    2 +-
>  36 files changed, 115 insertions(+), 248 deletions(-)
>  delete mode 100644 configs/ls2085a_emu_defconfig
>  delete mode 100644 configs/ls2085a_simu_defconfig
>  delete mode 100644 configs/ls2085aqds_SECURE_BOOT_defconfig
>  delete mode 100644 configs/ls2085aqds_defconfig
>  delete mode 100644 configs/ls2085aqds_nand_defconfig
>  delete mode 100644 configs/ls2085ardb_SECURE_BOOT_defconfig
>  delete mode 100644 configs/ls2085ardb_defconfig
>  delete mode 100644 configs/ls2085ardb_nand_defconfig
> 

Reviewed-by: Prabhakar Kushwaha <prabhakar.kuswaha at nxp.com>

Applied to u-boot-fsl-qoriq master. Awaiting upstream.

York