Not long ago, a change was made in U-Boot to switch the primary SoC from LS2085A to LS2080A. SoC name and board names were changed. It turns out the same board support both SoCs with a socket. It is possible to swtich SoC. In this case, using one unified image is more appropriate. If future SoC can be hosted on the same boards, they should be added.
At this moment, the board name remains LS2080ARDB and LS2080AQDS. They don't match the labels on the boards. Should this become a concern, we can rename the boards in a separated patch.
Tested on LS2085ARDB with both personalities.
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
York Sun (1): armv8: LS2080A: Consolidate LS2080A and LS2085A
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