armv8: LS2080A: Rename LS2085A to reflect LS2080A
Subsystems (5)
PATCH 1/2 armv8: LS2080A: Rename LS2085A to reflect LS2080A
From: Pratiyush Mohan Srivastava <[email protected]>
LS2080A is a prime personality of Freescale?s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe endpoint etc.
So renaming existing LS2085A code base to reflect LS2080A (Prime personality)
---
README | 3 +
arch/arm/Kconfig | 44 +++++++----
arch/arm/cpu/armv8/fsl-lsch3/Makefile | 2 +-
arch/arm/cpu/armv8/fsl-lsch3/README | 4 +-
arch/arm/cpu/armv8/fsl-lsch3/cpu.c | 10 ++-
arch/arm/cpu/armv8/fsl-lsch3/fdt.c | 2 +-
.../{ls2085a_serdes.c => ls2080a_serdes.c} | 2 +-
arch/arm/cpu/armv8/fsl-lsch3/speed.c | 10 +++
arch/arm/dts/Makefile | 4 +-
.../{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-lsch3/config.h | 8 +-
arch/arm/include/asm/arch-fsl-lsch3/immap_lsch3.h | 2 +
.../{ls2085a_stream_id.h => ls2080a_stream_id.h} | 4 +-
arch/arm/include/asm/global_data.h | 2 +-
board/freescale/{ls2085a => ls2080a}/Kconfig | 12 +--
board/freescale/ls2080a/MAINTAINERS | 8 ++
board/freescale/{ls2085a => ls2080a}/Makefile | 2 +-
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} | 4 +-
board/freescale/{ls2085aqds => ls2080aqds}/Kconfig | 6 +-
board/freescale/ls2080aqds/MAINTAINERS | 8 ++
.../freescale/{ls2085aqds => ls2080aqds}/Makefile | 2 +-
board/freescale/{ls2085aqds => ls2080aqds}/README | 16 ++--
board/freescale/{ls2085aqds => ls2080aqds}/ddr.c | 5 +-
board/freescale/{ls2085aqds => ls2080aqds}/ddr.h | 0
board/freescale/{ls2085aqds => ls2080aqds}/eth.c | 92 +++++++++++-----------
.../ls2085aqds.c => ls2080aqds/ls2080aqds.c} | 6 +-
.../ls2080aqds_qixis.h} | 0
board/freescale/{ls2085ardb => ls2080ardb}/Kconfig | 6 +-
board/freescale/ls2080ardb/MAINTAINERS | 8 ++
.../freescale/{ls2085ardb => ls2080ardb}/Makefile | 2 +-
board/freescale/{ls2085ardb => ls2080ardb}/README | 12 +--
board/freescale/{ls2085ardb => ls2080ardb}/ddr.c | 5 +-
board/freescale/{ls2085ardb => ls2080ardb}/ddr.h | 0
.../eth_ls2085rdb.c => ls2080ardb/eth_ls2080rdb.c} | 2 +-
.../ls2085ardb.c => ls2080ardb/ls2080ardb.c} | 6 +-
.../ls2080ardb_qixis.h} | 0
board/freescale/ls2085a/MAINTAINERS | 8 --
board/freescale/ls2085aqds/MAINTAINERS | 8 --
board/freescale/ls2085ardb/MAINTAINERS | 8 --
...ls2085a_emu_defconfig => ls2080a_emu_defconfig} | 3 +-
...2085a_simu_defconfig => ls2080a_simu_defconfig} | 3 +-
.../{ls2085ardb_defconfig => ls2080aqds_defconfig} | 5 +-
...ds_nand_defconfig => ls2080aqds_nand_defconfig} | 3 +-
.../{ls2085aqds_defconfig => ls2080ardb_defconfig} | 5 +-
...db_nand_defconfig => ls2080ardb_nand_defconfig} | 3 +-
doc/README.fsl-trustzone-components | 4 +-
drivers/ddr/fsl/fsl_ddr_gen4.c | 4 +-
drivers/mmc/fsl_esdhc.c | 12 +--
drivers/net/ldpaa_eth/Makefile | 2 +-
drivers/net/ldpaa_eth/{ls2085a.c => ls2080a.c} | 0
drivers/pci/pcie_layerscape.c | 2 +-
.../configs/{ls2085a_common.h => ls2080a_common.h} | 7 +-
include/configs/{ls2085a_emu.h => ls2080a_emu.h} | 8 +-
include/configs/{ls2085a_simu.h => ls2080a_simu.h} | 8 +-
include/configs/{ls2085aqds.h => ls2080aqds.h} | 4 +-
include/configs/{ls2085ardb.h => ls2080ardb.h} | 4 +-
include/fsl_esdhc.h | 2 +-
include/linux/usb/xhci-fsl.h | 6 +-
63 files changed, 241 insertions(+), 192 deletions(-)
rename arch/arm/cpu/armv8/fsl-lsch3/{ls2085a_serdes.c => ls2080a_serdes.c} (98%)
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-lsch3/{ls2085a_stream_id.h => ls2080a_stream_id.h} (93%)
rename board/freescale/{ls2085a => ls2080a}/Kconfig (66%)
create mode 100644 board/freescale/ls2080a/MAINTAINERS
rename board/freescale/{ls2085a => ls2080a}/Makefile (83%)
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/{ls2085aqds => ls2080aqds}/Kconfig (66%)
create mode 100644 board/freescale/ls2080aqds/MAINTAINERS
rename board/freescale/{ls2085aqds => ls2080aqds}/Makefile (83%)
rename board/freescale/{ls2085aqds => ls2080aqds}/README (95%)
rename board/freescale/{ls2085aqds => ls2080aqds}/ddr.c (98%)
rename board/freescale/{ls2085aqds => ls2080aqds}/ddr.h (100%)
rename board/freescale/{ls2085aqds => ls2080aqds}/eth.c (88%)
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/{ls2085ardb => ls2080ardb}/Kconfig (66%)
create mode 100644 board/freescale/ls2080ardb/MAINTAINERS
rename board/freescale/{ls2085ardb => ls2080ardb}/Makefile (72%)
rename board/freescale/{ls2085ardb => ls2080ardb}/README (94%)
rename board/freescale/{ls2085ardb => 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} (98%)
rename board/freescale/{ls2085ardb/ls2085ardb_qixis.h => ls2080ardb/ls2080ardb_qixis.h} (100%)
delete mode 100644 board/freescale/ls2085a/MAINTAINERS
delete mode 100644 board/freescale/ls2085aqds/MAINTAINERS
delete mode 100644 board/freescale/ls2085ardb/MAINTAINERS
rename configs/{ls2085a_emu_defconfig => ls2080a_emu_defconfig} (89%)
rename configs/{ls2085a_simu_defconfig => ls2080a_simu_defconfig} (89%)
rename configs/{ls2085ardb_defconfig => ls2080aqds_defconfig} (73%)
rename configs/{ls2085aqds_nand_defconfig => ls2080aqds_nand_defconfig} (75%)
rename configs/{ls2085aqds_defconfig => ls2080ardb_defconfig} (73%)
rename configs/{ls2085ardb_nand_defconfig => ls2080ardb_nand_defconfig} (75%)
rename drivers/net/ldpaa_eth/{ls2085a.c => ls2080a.c} (100%)
rename include/configs/{ls2085a_common.h => ls2080a_common.h} (98%)
rename include/configs/{ls2085a_emu.h => ls2080a_emu.h} (94%)
rename include/configs/{ls2085a_simu.h => ls2080a_simu.h} (96%)
rename include/configs/{ls2085aqds.h => ls2080aqds.h} (99%)
rename include/configs/{ls2085ardb.h => ls2080ardb.h} (99%)README +3 -0
@@ -611,6 +611,9 @@ The following options need to be configured: CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS Number of controllers used for other than main memory. + CONFIG_SYS_FSL_HAS_DP_DDR + Defines the SoC has DP-DDR used for DPAA. + CONFIG_SYS_FSL_SEC_BE Defines the SEC controller register space as Big Endian
arch/arm/Kconfig +27 -17
72 lines not on this page · raw message
arch/arm/cpu/armv8/fsl-lsch3/Makefile +1 -1
@@ -8,6 +8,6 @@ obj-y += cpu.o obj-y += lowlevel.o obj-y += soc.o obj-y += speed.o -obj-$(CONFIG_SYS_HAS_SERDES) += fsl_lsch3_serdes.o ls2085a_serdes.o +obj-$(CONFIG_SYS_HAS_SERDES) += fsl_lsch3_serdes.o ls2080a_serdes.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_OF_LIBFDT) += fdt.o
arch/arm/cpu/armv8/fsl-lsch3/README +2 -2
@@ -7,7 +7,7 @@ Freescale LayerScape with Chassis Generation 3 This architecture supports Freescale ARMv8 SoCs with Chassis generation 3, -for example LS2085A. +for example LS2080A. DDR Layout ============
@@ -152,7 +152,7 @@ u-boot command nand write <rcw image in memory> 0 <size of rcw image> To form the NAND image, build u-boot with NAND config, for example, -ls2085aqds_nand_defconfig. The image needed is u-boot-with-spl.bin. +ls2080aqds_nand_defconfig. The image needed is u-boot-with-spl.bin. The u-boot image should be written to match SRC_ADDR, in above example 0x20000. nand write <u-boot image in memory> 200000 <size of u-boot image>
arch/arm/cpu/armv8/fsl-lsch3/cpu.c +6 -4
@@ -25,11 +25,11 @@DECLARE_GLOBAL_DATA_PTR ; static struct cpu_type cpu_type_list[] = { -#ifdef CONFIG_LS2085A -CPU_TYPE_ENTRY (LS2085 ,LS2085 ,8 ), +#ifdef CONFIG_LS2080A CPU_TYPE_ENTRY (LS2080 ,LS2080 ,8 ), - CPU_TYPE_ENTRY(LS2045, LS2045, 4), #endif +CPU_TYPE_ENTRY (LS2085 ,LS2085 ,8 ), + CPU_TYPE_ENTRY(LS2045, LS2045, 4), };void cpu_name (char *name)
@@ -174,7 +174,7 @@ static const struct sys_mmu_table lsch3_final_mmu_table[] = { CONFIG_SYS_PCIE2_PHYS_SIZE, MT_DEVICE_NGNRNE, PMD_SECT_NON_SHARE }, { CONFIG_SYS_PCIE3_PHYS_ADDR, CONFIG_SYS_PCIE3_PHYS_ADDR, CONFIG_SYS_PCIE3_PHYS_SIZE, MT_DEVICE_NGNRNE, PMD_SECT_NON_SHARE }, -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A { CONFIG_SYS_PCIE4_PHYS_ADDR, CONFIG_SYS_PCIE4_PHYS_ADDR, CONFIG_SYS_PCIE4_PHYS_SIZE, MT_DEVICE_NGNRNE, PMD_SECT_NON_SHARE }, #endif
@@ -551,7 +551,9 @@ int print_cpuinfo(void)printf ("\n Bus: %-4s MHz " ,strmhz (buf, sysinfo.freq_systembus));printf ("DDR: %-4s MT/s" ,strmhz (buf, sysinfo.freq_ddrbus)); +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR printf (" DP-DDR: %-4s MT/s" ,strmhz (buf, sysinfo.freq_ddrbus2)); +#endif puts ("\n" );/* Display the RCW, so that no one gets confused as to what RCW
arch/arm/cpu/armv8/fsl-lsch3/fdt.c +1 -1
@@ -130,7 +130,7 @@ void append_mmu_masters(void *blob, const char *smmu_path,/* * The info below summarizes how streamID partitioning works -* for ls2085a and how it is conveyed to the OS via the device tree. +* for ls2080a and how it is conveyed to the OS via the device tree. * * -non-PCI legacy, platform devices (USB, SD/MMC, SATA, DMA) * -all legacy devices get a unique ICID assigned and programmed in
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c renamed from arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c +1 -1
@@ -29,7 +29,7 @@ static struct serdes_config serdes1_cfg_tbl[] = { SGMII1 } }, {0x26, {SGMII8, SGMII7, SGMII6, SGMII5, SGMII4, SGMII3, XFI2, XFI1 } }, {0x28, {SGMII8, SGMII7, SGMII6, SGMII5, XFI4, XFI3, XFI2, XFI1 } }, - {0x2A, {XFI8, XFI7, XFI6, XFI5, XFI4, XFI3, XFI2, XFI1 } }, + {0x2A, {NONE, NONE, NONE, XFI5, XFI4, XFI3, XFI2, XFI1 } }, {0x2B, {SGMII8, SGMII7, SGMII6, SGMII5, XAUI1, XAUI1, XAUI1, XAUI1 } }, {0x32, {XAUI2, XAUI2, XAUI2, XAUI2, XAUI1, XAUI1, XAUI1, XAUI1 } }, {0x33, {PCIE2, PCIE2, PCIE2, PCIE2, QSGMII_C, QSGMII_D, QSGMII_A,
arch/arm/cpu/armv8/fsl-lsch3/speed.c +10 -0
@@ -77,11 +77,15 @@ void get_sys_info(struct sys_info *sys_info) sys_info->freq_systembus = sysclk;#ifdef CONFIG_DDR_CLK_FREQ sys_info->freq_ddrbus =CONFIG_DDR_CLK_FREQ ; +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR sys_info->freq_ddrbus2 =CONFIG_DDR_CLK_FREQ ; +#endif #else sys_info->freq_ddrbus = sysclk; +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR sys_info->freq_ddrbus2 = sysclk;#endif +#endif sys_info->freq_systembus *= (in_le32 (&gur->rcwsr[0 ]) >> FSL_CHASSIS3_RCWSR0_SYS_PLL_RAT_SHIFT) &
@@ -91,9 +95,11 @@ void get_sys_info(struct sys_info *sys_info) sys_info->freq_ddrbus *= (in_le32 (&gur->rcwsr[0 ]) >>FSL_CHASSIS3_RCWSR0_MEM_PLL_RAT_SHIFT ) &FSL_CHASSIS3_RCWSR0_MEM_PLL_RAT_MASK ; +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR sys_info->freq_ddrbus2 *= (in_le32 (&gur->rcwsr[0 ]) >>FSL_CHASSIS3_RCWSR0_MEM2_PLL_RAT_SHIFT ) &FSL_CHASSIS3_RCWSR0_MEM2_PLL_RAT_MASK ; +#endif for (i =0 ; i <CONFIG_SYS_FSL_NUM_CC_PLLS ; i++) {/*
@@ -133,7 +139,9 @@ int get_clocks(void) gd->cpu_clk = sys_info.freq_processor[0 ]; gd->bus_clk = sys_info.freq_systembus; gd->mem_clk = sys_info.freq_ddrbus; +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR gd->arch.mem2_clk = sys_info.freq_ddrbus2; +#endif #if defined(CONFIG_FSL_ESDHC ) gd->arch.sdhc_clk = gd->bus_clk /2 ;#endif /* defined(CONFIG_FSL_ESDHC) */
@@ -169,8 +177,10 @@ ulong get_ddr_freq(ulong ctrl_num)* DDR controller 0 & 1 are on memory complex 0 * DDR controler 2 is on memory complext 1 */ +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR if (ctrl_num >=2 )return gd->arch.mem2_clk; +#endif return gd->mem_clk; }
arch/arm/dts/Makefile +2 -2
@@ -74,8 +74,8 @@ dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \ ls1021a-twr.dtb -dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2085a-qds.dtb \ - fsl-ls2085a-rdb.dtb +dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ + fsl-ls2080a-rdb.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \
arch/arm/dts/fsl-ls2080a-qds.dts renamed from arch/arm/dts/fsl-ls2085a-qds.dts +4 -4
@@ -1,5 +1,5 @@ /* - * Freescale ls2085a QDS board device tree source + * Freescale ls2080a QDS board device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. *
@@ -8,11 +8,11 @@ /dts-v1/; -#include "fsl-ls2085a.dtsi" +#include "fsl-ls2080a.dtsi" / { - model = "Freescale Layerscape 2085a QDS Board"; - compatible = "fsl,ls2085a-qds", "fsl,ls2085a"; + model = "Freescale Layerscape 2080a QDS Board"; + compatible = "fsl,ls2080a-qds", "fsl,ls2080a"; aliases { spi1 = &dspi;
arch/arm/dts/fsl-ls2080a-rdb.dts renamed from arch/arm/dts/fsl-ls2085a-rdb.dts +4 -4
@@ -1,5 +1,5 @@ /* - * Freescale ls2085a RDB board device tree source + * Freescale ls2080a RDB board device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. *
@@ -8,11 +8,11 @@ /dts-v1/; -#include "fsl-ls2085a.dtsi" +#include "fsl-ls2080a.dtsi" / { - model = "Freescale Layerscape 2085a RDB Board"; - compatible = "fsl,ls2085a-rdb", "fsl,ls2085a"; + model = "Freescale Layerscape 2080a RDB Board"; + compatible = "fsl,ls2080a-rdb", "fsl,ls2080a"; aliases { spi1 = &dspi;
arch/arm/dts/fsl-ls2080a.dtsi renamed from arch/arm/dts/fsl-ls2085a.dtsi +2 -2
@@ -1,5 +1,5 @@ /* - * Freescale ls2085a SOC common device tree source + * Freescale ls2080a SOC common device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. *
@@ -7,7 +7,7 @@ */ / { - compatible = "fsl,ls2085a"; + compatible = "fsl,ls2080a"; interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>;
arch/arm/include/asm/arch-fsl-lsch3/config.h +4 -4
@@ -65,8 +65,8 @@#define I2C3_BASE_ADDR (CONFIG_SYS_IMMR + 0x01020000)#define I2C4_BASE_ADDR (CONFIG_SYS_IMMR + 0x01030000) -#define CONFIG_SYS_LS2085A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) -#define CONFIG_SYS_LS2085A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02110000) +#define CONFIG_SYS_LS2080A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_LS2080A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02110000)/* TZ Protection Controller Definitions */ #define TZPC_BASE 0x02200000
@@ -163,7 +163,7 @@#define SCFG_BASE 0x01fc0000#define SCFG_USB3PRM1CR 0x000 -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A #define CONFIG_MAX_CPUS 16#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8#define CONFIG_NUM_DDR_CONTROLLERS 3
@@ -174,7 +174,7 @@#error SoC not defined#endif -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A #define CONFIG_SYS_FSL_ERRATUM_A008336 #define CONFIG_SYS_FSL_ERRATUM_A008511 #define CONFIG_SYS_FSL_ERRATUM_A008514
arch/arm/include/asm/arch-fsl-lsch3/immap_lsch3.h +2 -0
@@ -15,7 +15,9 @@ struct sys_info {unsigned long freq_processor[CONFIG_MAX_CPUS ];unsigned long freq_systembus;unsigned long freq_ddrbus; +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR unsigned long freq_ddrbus2; +#endif unsigned long freq_localbus;unsigned long freq_qe;#ifdef CONFIG_SYS_DPAA_FMAN
arch/arm/include/asm/arch-fsl-lsch3/ls2080a_stream_id.h renamed from arch/arm/include/asm/arch-fsl-lsch3/ls2085a_stream_id.h +2 -2
@@ -7,7 +7,7 @@#ifndef __FSL_STREAM_ID_H#define __FSL_STREAM_ID_H -/* Stream IDs on ls2085a devices are not hardwired and are +/* Stream IDs on ls2080a devices are not hardwired and are * programmed by sw. There are a limited number of stream IDs * available, and the partitioning of them is scenario dependent. * This header defines the partitioning between legacy, PCI,
@@ -17,7 +17,7 @@* on the specific hardware config-- e.g. perhaps not all * PEX controllers are in use. * -* On LS2085 stream IDs are programmed in AMQ registers (32-bits) for +* On LS2080 stream IDs are programmed in AMQ registers (32-bits) for * each of the different bus masters. The relationship between * the AMQ registers and stream IDs is defined in the table below: * AMQ bit streamID bit
arch/arm/include/asm/global_data.h +1 -1
@@ -46,7 +46,7 @@ struct arch_global_data {u32 omap_boot_mode;u8 omap_ch_flags;#endif -#ifdef CONFIG_FSL_LSCH3 +#if defined(CONFIG_FSL_LSCH3 ) && defined(CONFIG_SYS_FSL_HAS_DP_DDR )unsigned long mem2_clk;#endif };
board/freescale/ls2080a/Kconfig renamed from board/freescale/ls2085a/Kconfig +6 -6
@@ -1,7 +1,7 @@ -if TARGET_LS2085A_EMU +if TARGET_LS2080A_EMU config SYS_BOARD - default "ls2085a" + default "ls2080a" config SYS_VENDOR default "freescale"
@@ -10,14 +10,14 @@ config SYS_SOC default "fsl-lsch3" config SYS_CONFIG_NAME - default "ls2085a_emu" + default "ls2080a_emu" endif -if TARGET_LS2085A_SIMU +if TARGET_LS2080A_SIMU config SYS_BOARD - default "ls2085a" + default "ls2080a" config SYS_VENDOR default "freescale"
@@ -26,6 +26,6 @@ config SYS_SOC default "fsl-lsch3" config SYS_CONFIG_NAME - default "ls2085a_simu" + default "ls2080a_simu" endif
board/freescale/ls2080a/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +LS2080A BOARD +M: York Sun <[email protected]> +S: Maintained +F: board/freescale/ls2080a/ +F: include/configs/ls2080a_emu.h +F: configs/ls2080a_emu_defconfig +F: include/configs/ls2080a_simu.h +F: configs/ls2080a_simu_defconfig
board/freescale/ls2080a/Makefile renamed from board/freescale/ls2085a/Makefile +1 -1
@@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ls2085a.o +obj-y += ls2080a.o obj-y += ddr.o
board/freescale/ls2080a/README renamed from board/freescale/ls2085a/README +1 -1
@@ -1,4 +1,4 @@ -Freescale ls2085a_emu +Freescale ls2080a_emu This is a emulator target with limited peripherals.
board/freescale/ls2080a/ddr.c renamed from board/freescale/ls2085a/ddr.c +2 -1
@@ -71,7 +71,7 @@ found: pbsp->n_ranks, pbsp->datarate_mhz_high, pbsp->rank_gb, pbsp->clk_adjust, pbsp->wrlvl_start, pbsp->wrlvl_ctl_2, pbsp->wrlvl_ctl_3); - +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR if (ctrl_num ==CONFIG_DP_DDR_CTRL ) {/* force DDR bus width to 32 bits */ popts->data_bus_width =1 ;
@@ -79,6 +79,7 @@ found: popts->burst_length =DDR_BL8 ; popts->bstopre = 0; /* enable auto precharge */ } +#endif /* * Factors to consider for half-strength driver enable: * - number of DIMMs installed
board/freescale/ls2080a/ddr.h renamed from board/freescale/ls2085a/ddr.h +0 -0
board/freescale/ls2080a/ls2080a.c renamed from board/freescale/ls2085a/ls2085a.c +2 -2
@@ -35,7 +35,7 @@ int board_early_init_f(void)fsl_lsch3_early_init_f ();return 0 ; } - +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR void detail_board_ddr_info (void ) {puts ("\nDDR " );
@@ -47,7 +47,7 @@ void detail_board_ddr_info(void) print_ddr_info(CONFIG_DP_DDR_CTRL); } } - +#endif int dram_init (void ) { gd->ram_size =initdram (0 );
board/freescale/ls2080aqds/Kconfig renamed from board/freescale/ls2085aqds/Kconfig +3 -3
@@ -1,8 +1,8 @@ -if TARGET_LS2085AQDS +if TARGET_LS2080AQDS config SYS_BOARD - default "ls2085aqds" + default "ls2080aqds" config SYS_VENDOR default "freescale"
@@ -11,6 +11,6 @@ config SYS_SOC default "fsl-lsch3" config SYS_CONFIG_NAME - default "ls2085aqds" + default "ls2080aqds" endif
board/freescale/ls2080aqds/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +LS2080A BOARD +M: Prabhakar Kushwaha <[email protected]> +S: Maintained +F: board/freescale/ls2080aqds/ +F: board/freescale/ls2080a/ls2080aqds.c +F: include/configs/ls2080aqds.h +F: configs/ls2080aqds_defconfig +F: configs/ls2080aqds_nand_defconfig
board/freescale/ls2080aqds/Makefile renamed from board/freescale/ls2085aqds/Makefile +1 -1
@@ -4,6 +4,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ls2085aqds.o +obj-y += ls2080aqds.o obj-y += ddr.o obj-y += eth.o
board/freescale/ls2080aqds/README renamed from board/freescale/ls2085aqds/README +8 -8
@@ -1,19 +1,19 @@ Overview -------- -The LS2085A Development System (QDS) is a high-performance computing, -evaluation, and development platform that supports the QorIQ LS2085A -Layerscape Architecture processor. The LS2085AQDS provides validation and -SW development platform for the Freescale LS2085A processor series, with +The LS2080A Development System (QDS) is a high-performance computing, +evaluation, and development platform that supports the QorIQ LS2080A +Layerscape Architecture processor. The LS2080AQDS provides validation and +SW development platform for the Freescale LS2080A processor series, with a complete debugging environment. -LS2085A SoC Overview +LS2080A SoC Overview ------------------ -The LS2085A integrated multicore processor combines eight ARM Cortex-A57 +The LS2080A integrated multicore processor combines eight ARM Cortex-A57 processor cores with high-performance data path acceleration logic and network and peripheral bus interfaces required for networking, telecom/datacom, wireless infrastructure, and mil/aerospace applications. -The LS2085A SoC includes the following function and features: +The LS2080A SoC includes the following function and features: - Eight 64-bit ARM Cortex-A57 CPUs - 1 MB platform cache with ECC
@@ -50,7 +50,7 @@ The LS2085A SoC includes the following function and features: - Service processor (SP) provides pre-boot initialization and secure-boot capabilities - LS2085AQDS board Overview + LS2080AQDS board Overview ----------------------- - SERDES Connections, 16 lanes supporting: - PCI Express - 3.0
board/freescale/ls2080aqds/ddr.c renamed from board/freescale/ls2085aqds/ddr.c +4 -1
@@ -15,7 +15,9 @@ void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm, unsigned int ctrl_num) { +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR u8 dq_mapping_0, dq_mapping_2, dq_mapping_3; +#endif const struct board_specific_parameters *pbsp, *pbsp_highest =NULL ;ulong ddr_freq;int slot;
@@ -79,7 +81,7 @@ found: pbsp->n_ranks, pbsp->datarate_mhz_high, pbsp->rank_gb, pbsp->clk_adjust, pbsp->wrlvl_start, pbsp->wrlvl_ctl_2, pbsp->wrlvl_ctl_3); - +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR if (ctrl_num ==CONFIG_DP_DDR_CTRL ) {/* force DDR bus width to 32 bits */ popts->data_bus_width =1 ;
@@ -114,6 +116,7 @@ found: pdimm[slot].dq_mapping[16 ] =0 ; pdimm[slot].dq_mapping[17] = 0; } +#endif /* To work at higher than 1333MT/s */ popts->half_strength_driver_enable =0 ;/*
board/freescale/ls2080aqds/ddr.h renamed from board/freescale/ls2085aqds/ddr.h +0 -0
board/freescale/ls2080aqds/eth.c renamed from board/freescale/ls2085aqds/eth.c +46 -46
227 lines not on this page · raw message
board/freescale/ls2080aqds/ls2080aqds.c renamed from board/freescale/ls2085aqds/ls2085aqds.c +3 -3
@@ -21,7 +21,7 @@#include <hwconfig.h> #include "../common/qixis.h" -#include "ls2085aqds_qixis.h" +#include "ls2080aqds_qixis.h" #define PIN_MUX_SEL_SDHC 0x00#define PIN_MUX_SEL_DSPI 0x0a
@@ -220,7 +220,7 @@ int board_early_init_f(void)fsl_lsch3_early_init_f ();return 0 ; } - +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR void detail_board_ddr_info (void ) {puts ("\nDDR " );
@@ -232,7 +232,7 @@ void detail_board_ddr_info(void) print_ddr_info(CONFIG_DP_DDR_CTRL); } } - +#endif int dram_init (void ) { gd->ram_size =initdram (0 );
board/freescale/ls2080aqds/ls2080aqds_qixis.h renamed from board/freescale/ls2085aqds/ls2085aqds_qixis.h +0 -0
board/freescale/ls2080ardb/Kconfig renamed from board/freescale/ls2085ardb/Kconfig +3 -3
@@ -1,8 +1,8 @@ -if TARGET_LS2085ARDB +if TARGET_LS2080ARDB config SYS_BOARD - default "ls2085ardb" + default "ls2080ardb" config SYS_VENDOR default "freescale"
@@ -11,6 +11,6 @@ config SYS_SOC default "fsl-lsch3" config SYS_CONFIG_NAME - default "ls2085ardb" + default "ls2080ardb" endif
board/freescale/ls2080ardb/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +LS2080A BOARD +M: Prabhakar Kushwaha <[email protected]> +S: Maintained +F: board/freescale/ls2080ardb/ +F: board/freescale/ls2080a/ls2080ardb.c +F: include/configs/ls2080ardb.h +F: configs/ls2080ardb_defconfig +F: configs/ls2080ardb_nand_defconfig
board/freescale/ls2080ardb/Makefile renamed from board/freescale/ls2085ardb/Makefile +1 -1
@@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += ls2085ardb.o eth_ls2085rdb.o +obj-y += ls2080ardb.o eth_ls2080rdb.o obj-y += ddr.o
board/freescale/ls2080ardb/README renamed from board/freescale/ls2085ardb/README +6 -6
@@ -1,17 +1,17 @@ Overview -------- -The LS2085A Reference Design (RDB) is a high-performance computing, -evaluation, and development platform that supports the QorIQ LS2085A +The LS2080A Reference Design (RDB) is a high-performance computing, +evaluation, and development platform that supports the QorIQ LS2080A Layerscape Architecture processor. -LS2085A SoC Overview +LS2080A SoC Overview ------------------ -The LS2085A integrated multicore processor combines eight ARM Cortex-A57 +The LS2080A integrated multicore processor combines eight ARM Cortex-A57 processor cores with high-performance data path acceleration logic and network and peripheral bus interfaces required for networking, telecom/datacom, wireless infrastructure, and mil/aerospace applications. -The LS2085A SoC includes the following function and features: +The LS2080A SoC includes the following function and features: - Eight 64-bit ARM Cortex-A57 CPUs - 1 MB platform cache with ECC
@@ -48,7 +48,7 @@ The LS2085A SoC includes the following function and features: - Service processor (SP) provides pre-boot initialization and secure-boot capabilities - LS2085ARDB board Overview + LS2080ARDB board Overview ----------------------- - SERDES Connections, 16 lanes supporting: - PCI Express - 3.0
board/freescale/ls2080ardb/ddr.c renamed from board/freescale/ls2085ardb/ddr.c +4 -1
@@ -15,7 +15,9 @@ void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm, unsigned int ctrl_num) { +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR u8 dq_mapping_0, dq_mapping_2, dq_mapping_3; +#endif const struct board_specific_parameters *pbsp, *pbsp_highest =NULL ;ulong ddr_freq;int slot;
@@ -79,7 +81,7 @@ found: pbsp->n_ranks, pbsp->datarate_mhz_high, pbsp->rank_gb, pbsp->clk_adjust, pbsp->wrlvl_start, pbsp->wrlvl_ctl_2, pbsp->wrlvl_ctl_3); - +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR if (ctrl_num ==CONFIG_DP_DDR_CTRL ) {/* force DDR bus width to 32 bits */ popts->data_bus_width =1 ;
@@ -114,6 +116,7 @@ found: pdimm[slot].dq_mapping[16 ] =0 ; pdimm[slot].dq_mapping[17] = 0; } +#endif /* To work at higher than 1333MT/s */ popts->half_strength_driver_enable =0 ;/*
board/freescale/ls2080ardb/ddr.h renamed from board/freescale/ls2085ardb/ddr.h +0 -0
board/freescale/ls2080ardb/eth_ls2080rdb.c renamed from board/freescale/ls2085ardb/eth_ls2085rdb.c +1 -1
@@ -98,7 +98,7 @@ int board_eth_init(bd_t *bis)break ;default : -printf ("SerDes1 protocol 0x%x is not supported on LS2085aRDB\n" , +printf ("SerDes1 protocol 0x%x is not supported on LS2080aRDB\n" , srds_s1);break ; }
board/freescale/ls2080ardb/ls2080ardb.c renamed from board/freescale/ls2085ardb/ls2085ardb.c +3 -3
@@ -20,7 +20,7 @@#include <asm/arch-fsl-lsch3/soc.h> #include "../common/qixis.h" -#include "ls2085ardb_qixis.h" +#include "ls2080ardb_qixis.h" #define PIN_MUX_SEL_SDHC 0x00#define PIN_MUX_SEL_DSPI 0x0a
@@ -186,7 +186,7 @@ int misc_init_r(void)return 0 ; } - +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR void detail_board_ddr_info (void ) {puts ("\nDDR " );
@@ -198,7 +198,7 @@ void detail_board_ddr_info(void) print_ddr_info(CONFIG_DP_DDR_CTRL); } } - +#endif int dram_init (void ) { gd->ram_size =initdram (0 );
board/freescale/ls2080ardb/ls2080ardb_qixis.h renamed from board/freescale/ls2085ardb/ls2085ardb_qixis.h +0 -0
board/freescale/ls2085a/MAINTAINERS deleted +0 -8
@@ -1,8 +0,0 @@ -LS2085A BOARD -M: York Sun <[email protected]> -S: Maintained -F: board/freescale/ls2085a/ -F: include/configs/ls2085a_emu.h -F: configs/ls2085a_emu_defconfig -F: include/configs/ls2085a_simu.h -F: configs/ls2085a_simu_defconfig
board/freescale/ls2085aqds/MAINTAINERS deleted +0 -8
@@ -1,8 +0,0 @@ -LS2085A BOARD -M: Prabhakar Kushwaha <[email protected]> -S: Maintained -F: board/freescale/ls2085aqds/ -F: board/freescale/ls2085a/ls2085aqds.c -F: include/configs/ls2085aqds.h -F: configs/ls2085aqds_defconfig -F: configs/ls2085aqds_nand_defconfig
board/freescale/ls2085ardb/MAINTAINERS deleted +0 -8
@@ -1,8 +0,0 @@ -LS2085A BOARD -M: Prabhakar Kushwaha <[email protected]> -S: Maintained -F: board/freescale/ls2085ardb/ -F: board/freescale/ls2085a/ls2085ardb.c -F: include/configs/ls2085ardb.h -F: configs/ls2085ardb_defconfig -F: configs/ls2085ardb_nand_defconfig
configs/ls2080a_emu_defconfig renamed from configs/ls2085a_emu_defconfig +2 -1
@@ -1,6 +1,7 @@ CONFIG_ARM=y -CONFIG_TARGET_LS2085A_EMU=y +CONFIG_TARGET_LS2080A_EMU=y CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4" +CONFIG_LS2080A=y # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set
configs/ls2080a_simu_defconfig renamed from configs/ls2085a_simu_defconfig +2 -1
@@ -1,6 +1,7 @@ CONFIG_ARM=y -CONFIG_TARGET_LS2085A_SIMU=y +CONFIG_TARGET_LS2080A_SIMU=y CONFIG_SYS_EXTRA_OPTIONS="SIMU" +CONFIG_LS2080A=y # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set
configs/ls2080aqds_defconfig renamed from configs/ls2085ardb_defconfig +3 -2
@@ -1,9 +1,10 @@ CONFIG_ARM=y -CONFIG_TARGET_LS2085ARDB=y +CONFIG_TARGET_LS2080AQDS=y # CONFIG_SYS_MALLOC_F is not set +CONFIG_LS2080A=y CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y -CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-rdb" +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-qds" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y
configs/ls2080aqds_nand_defconfig renamed from configs/ls2085aqds_nand_defconfig +2 -1
@@ -1,6 +1,7 @@ CONFIG_ARM=y -CONFIG_TARGET_LS2085AQDS=y +CONFIG_TARGET_LS2080AQDS=y CONFIG_SPL=y +CONFIG_LS2080A=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND" # CONFIG_CMD_SETEXPR is not set CONFIG_NETDEVICES=y
configs/ls2080ardb_defconfig renamed from configs/ls2085aqds_defconfig +3 -2
@@ -1,9 +1,10 @@ CONFIG_ARM=y -CONFIG_TARGET_LS2085AQDS=y +CONFIG_TARGET_LS2080ARDB=y # CONFIG_SYS_MALLOC_F is not set CONFIG_DM_SPI=y +CONFIG_LS2080A=y CONFIG_DM_SPI_FLASH=y -CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2085a-qds" +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2080a-rdb" CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y
configs/ls2080ardb_nand_defconfig renamed from configs/ls2085ardb_nand_defconfig +2 -1
@@ -1,7 +1,8 @@ CONFIG_ARM=y -CONFIG_TARGET_LS2085ARDB=y +CONFIG_TARGET_LS2080ARDB=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,NAND" +CONFIG_LS2080A=y # CONFIG_CMD_SETEXPR is not set CONFIG_NETDEVICES=y CONFIG_E1000=y
doc/README.fsl-trustzone-components +2 -2
@@ -1,4 +1,4 @@ -Freescale ARM64 SoCs like LS2085A have ARM TrustZone components like +Freescale ARM64 SoCs like LS2080A have ARM TrustZone components like TZPC-BP147 (TrustZone Protection Controller) and TZASC-400 (TrustZone Address Space Controller).
@@ -7,7 +7,7 @@ is left to a root-of-trust security software layer (running in EL3 privilege mode), but still some configurations of these peripherals might be required while the bootloader is executing in EL3 privilege mode. The following sections define how to turn on these features for -LS2085A like SoCs. +LS2080A like SoCs. TZPC-BP147 (TrustZone Protection Controller) ============================================
drivers/ddr/fsl/fsl_ddr_gen4.c +2 -2
@@ -107,14 +107,14 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, goto step2; #ifdef CONFIG_SYS_FSL_ERRATUM_A008336 -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A /* A008336 only applies to general DDR controllers */ if ((ctrl_num == 0) || (ctrl_num == 1)) #endif ddr_out32(eddrtqcr1, 0x63b30002); #endif #ifdef CONFIG_SYS_FSL_ERRATUM_A008514 -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A /* A008514 only applies to DP-DDR controler */ if (ctrl_num == 2) #endif
drivers/mmc/fsl_esdhc.c +6 -6
@@ -106,7 +106,7 @@ static uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data) xfertyp |=XFERTYP_RSPTYP_48 ;#if defined(CONFIG_MX53 ) || defined(CONFIG_PPC_T4240 ) || \ - defined(CONFIG_LS102XA ) || defined(CONFIG_LS2085A ) + defined(CONFIG_LS102XA ) || defined(CONFIG_LS2080A )if (cmd->cmdidx ==MMC_CMD_STOP_TRANSMISSION ) xfertyp |=XFERTYP_CMDTYP_ABORT ;#endif
@@ -184,7 +184,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)int timeout;struct fsl_esdhc_cfg *cfg = mmc->priv;struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base; -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A dma_addr_t addr;#endif uint wml_value;
@@ -197,7 +197,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)esdhc_clrsetbits32 (®s->wml,WML_RD_WML_MASK , wml_value);#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A addr =virt_to_phys ((void *)(data->dest));if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );
@@ -223,7 +223,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)esdhc_clrsetbits32 (®s->wml,WML_WR_WML_MASK , wml_value <<16 );#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A addr =virt_to_phys ((void *)(data->src));if (upper_32_bits (addr))printf ("Error found for upper 32 bits\n" );
@@ -277,7 +277,7 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)static void check_and_invalidate_dcache_range (struct mmc_cmd *cmd,struct mmc_data *data) { -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A unsigned start =0 ;#else unsigned start = (unsigned )data->dest ;
@@ -285,7 +285,7 @@ static void check_and_invalidate_dcache_rangeunsigned size =roundup (ARCH_DMA_MINALIGN , data->blocks*data->blocksize);unsigned end = start+size ; -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A dma_addr_t addr; addr =virt_to_phys ((void *)(data->dest));
drivers/net/ldpaa_eth/Makefile +1 -1
@@ -6,4 +6,4 @@ obj-y += ldpaa_wriop.o obj-y += ldpaa_eth.o -obj-$(CONFIG_LS2085A) += ls2085a.o +obj-$(CONFIG_LS2080A) += ls2080a.o
drivers/net/ldpaa_eth/ls2080a.c renamed from drivers/net/ldpaa_eth/ls2085a.c +0 -0
drivers/pci/pcie_layerscape.c +1 -1
@@ -663,7 +663,7 @@ void ft_pci_setup(void *blob, bd_t *bd) }#endif -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A void pcie_set_available_streamids (void *blob,const char *pcie_path,u32 *stream_ids,int count)
include/configs/ls2080a_common.h renamed from include/configs/ls2085a_common.h +4 -3
@@ -11,7 +11,6 @@#define CONFIG_REMAKE_ELF #define CONFIG_FSL_LSCH3 -#define CONFIG_LS2085A #define CONFIG_GICV3 #define CONFIG_FSL_TZPC_BP147
@@ -19,7 +18,7 @@#define CONFIG_ARM_ERRATA_828024 #define CONFIG_ARM_ERRATA_826974 -#include <asm/arch-fsl-lsch3/ls2085a_stream_id.h> +#include <asm/arch-fsl-lsch3/ls2080a_stream_id.h> #include <asm/arch-fsl-lsch3/config.h> #if (defined(CONFIG_SYS_FSL_SRDS_1 ) || defined(CONFIG_SYS_FSL_SRDS_2 ))#define CONFIG_SYS_HAS_SERDES
@@ -74,6 +73,7 @@#define CPU_RELEASE_ADDR secondary_boot_func#define CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_SYS_DP_DDR_BASE 0x6000000000ULL/* * DDR controller use 0 as the base address for binding.
@@ -82,6 +82,7 @@#define CONFIG_SYS_DP_DDR_BASE_PHY 0#define CONFIG_DP_DDR_CTRL 2#define CONFIG_DP_DDR_NUM_CTRLS 1 +#endif /* Generic Timer Definitions */ /*
@@ -199,7 +200,7 @@ unsigned long long get_qixis_addr(void);#define CONFIG_PCIE3 /* PCIE controler 3 */ #define CONFIG_PCIE4 /* PCIE controler 4 */ #define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ -#define FSL_PCIE_COMPAT "fsl,ls2085a-pcie" +#define FSL_PCIE_COMPAT "fsl,ls2080a-pcie"#define CONFIG_SYS_PCI_64BIT
include/configs/ls2080a_emu.h renamed from include/configs/ls2085a_emu.h +5 -3
@@ -7,10 +7,10 @@#ifndef __LS2_EMU_H#define __LS2_EMU_H -#include "ls2085a_common.h" +#include "ls2080a_common.h" -#define CONFIG_IDENT_STRING " LS2085A-EMU" -#define CONFIG_BOOTP_VCI_STRING "U-boot.LS2085A-EMU" +#define CONFIG_IDENT_STRING " LS2080A-EMU" +#define CONFIG_BOOTP_VCI_STRING "U-boot.LS2080A-EMU"#define CONFIG_SYS_CLK_FREQ 100000000#define CONFIG_DDR_CLK_FREQ 133333333
@@ -27,7 +27,9 @@#define CONFIG_SYS_SPD_BUS_NUM 1/* SPD on I2C bus 1 */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_CHIP_SELECTS_PER_CTRL 4 +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1 +#endif #define CONFIG_FSL_DDR_SYNC_REFRESH
include/configs/ls2080a_simu.h renamed from include/configs/ls2085a_simu.h +5 -3
@@ -7,10 +7,10 @@#ifndef __LS2_SIMU_H#define __LS2_SIMU_H -#include "ls2085a_common.h" +#include "ls2080a_common.h" -#define CONFIG_IDENT_STRING " LS2085A-SIMU" -#define CONFIG_BOOTP_VCI_STRING "U-boot.LS2085A-SIMU" +#define CONFIG_IDENT_STRING " LS2080A-SIMU" +#define CONFIG_BOOTP_VCI_STRING "U-boot.LS2080A-SIMU"#define CONFIG_SYS_CLK_FREQ 100000000#define CONFIG_DDR_CLK_FREQ 133333333
@@ -20,7 +20,9 @@#define CONFIG_DIMM_SLOTS_PER_CTLR 1#define CONFIG_CHIP_SELECTS_PER_CTRL 4 +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1 +#endif /* SMSC 91C111 ethernet configuration */ #define CONFIG_SMC91111
include/configs/ls2080aqds.h renamed from include/configs/ls2085aqds.h +3 -1
@@ -7,7 +7,7 @@#ifndef __LS2_QDS_H#define __LS2_QDS_H -#include "ls2085a_common.h" +#include "ls2080a_common.h" #define CONFIG_DISPLAY_BOARDINFO
@@ -34,7 +34,9 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_SYS_SPD_BUS_NUM 0/* SPD on I2C bus 0 */ #define CONFIG_DIMM_SLOTS_PER_CTLR 2#define CONFIG_CHIP_SELECTS_PER_CTRL 4 +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1 +#endif #define CONFIG_FSL_DDR_BIST /* enable built-in memory test */ /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */
include/configs/ls2080ardb.h renamed from include/configs/ls2085ardb.h +3 -1
@@ -7,7 +7,7 @@#ifndef __LS2_RDB_H#define __LS2_RDB_H -#include "ls2085a_common.h" +#include "ls2080a_common.h" #undef CONFIG_CONS_INDEX#define CONFIG_CONS_INDEX 2
@@ -36,7 +36,9 @@ unsigned long get_board_sys_clk(void);#define CONFIG_SYS_SPD_BUS_NUM 0/* SPD on I2C bus 0 */ #define CONFIG_DIMM_SLOTS_PER_CTLR 2#define CONFIG_CHIP_SELECTS_PER_CTRL 4 +#ifdef CONFIG_SYS_FSL_HAS_DP_DDR #define CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR 1 +#endif #define CONFIG_FSL_DDR_BIST /* enable built-in memory test */ /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */
include/fsl_esdhc.h +1 -1
@@ -166,7 +166,7 @@#define ESDHC_VENDORSPEC_VSELECT 0x00000002/* Use 1.8V */ struct fsl_esdhc_cfg { -#ifdef CONFIG_LS2085A +#ifdef CONFIG_LS2080A u64 esdhc_base;#else u32 esdhc_base;
include/linux/usb/xhci-fsl.h +3 -3
@@ -54,9 +54,9 @@ struct fsl_xhci {#if defined(CONFIG_LS102XA )#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS102XA_XHCI_USB1_ADDR#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 -#elif defined(CONFIG_LS2085A ) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2085A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2085A_XHCI_USB2_ADDR +#elif defined(CONFIG_LS2080A ) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2080A_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR#endif #define FSL_USB_XHCI_ADDR {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \
Signature · 1 line
1.9.1
PATCH 1/2 armv8: LS2080A: Rename LS2085A to reflect LS2080A
Quoted 9 lines · Prabhakar Kushwaha
From: Pratiyush Mohan Srivastava <[email protected]>
LS2080A is a prime personality of Freescale?s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe endpoint etc.
So renaming existing LS2085A code base to reflect LS2080A (Prime personality)
Signed-off-by Pratiyush Mohan Srivastava <[email protected]>---
<snip>
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c static struct serdes_config serdes1_cfg_tbl[] = { · line 32
Quoted 13 lines
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c renamed from arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c +1
-1@@ -29,7 +29,7 @@ static struct serdes_config serdes1_cfg_tbl[] = { SGMII1 } }, {0x26, {SGMII8, SGMII7, SGMII6, SGMII5, SGMII4, SGMII3, XFI2, XFI1 } }, {0x28, {SGMII8, SGMII7, SGMII6, SGMII5, XFI4, XFI3, XFI2, XFI1 } }, - {0x2A, {XFI8, XFI7, XFI6, XFI5, XFI4, XFI3, XFI2, XFI1 } }, + {0x2A, {NONE, NONE, NONE, XFI5, XFI4, XFI3, XFI2, XFI1 } },
Is this change related for LS2080 only? Does LS2085 use the first four lanes?
With this patch, target LS2080AQDS/RDB will support both LS2080 and LS2085, correct?
York
PATCH 1/2 armv8: LS2080A: Rename LS2085A to reflect LS2080A
Quoted 31 lines · York Sun
Quoted 9 lines · Prabhakar Kushwaha
From: Pratiyush Mohan Srivastava <[email protected]>
LS2080A is a prime personality of Freescale?s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe endpoint etc.
So renaming existing LS2085A code base to reflect LS2080A (Prime personality)
Signed-off-by Pratiyush Mohan Srivastava <[email protected]>---
<snip>
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c static struct serdes_config serdes1_cfg_tbl[] = { · line 32
Quoted 13 lines
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c renamed from arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c +1
-1@@ -29,7 +29,7 @@ static struct serdes_config serdes1_cfg_tbl[] = { SGMII1 } }, {0x26, {SGMII8, SGMII7, SGMII6, SGMII5, SGMII4, SGMII3, XFI2, XFI1 } }, {0x28, {SGMII8, SGMII7, SGMII6, SGMII5, XFI4, XFI3, XFI2, XFI1 } }, - {0x2A, {XFI8, XFI7, XFI6, XFI5, XFI4, XFI3, XFI2, XFI1 } }, + {0x2A, {NONE, NONE, NONE, XFI5, XFI4, XFI3, XFI2, XFI1 } },Is this change related for LS2080 only? Does LS2085 use the first four lanes?
Quoted 1 line
With this patch, target LS2080AQDS/RDB will support both LS2080 and LS2085, correct?
Please ignore this comment. I see my answer in your second patch.
York
PATCH 1/2 armv8: LS2080A: Rename LS2085A to reflect LS2080A
In reply to York SunQuoted 40 lines
-----Original Message-----
From: York Sun [mailto:yorksun at freescale.com]
Sent: Thursday, October 15, 2015 9:56 PM
To: Kushwaha Prabhakar-B32579 <[email protected]>; u- boot at lists.denx.de
Cc: Srivastava Pratiyush-B46174 <[email protected]>
Subject: Re: [PATCH 1/2] armv8: LS2080A: Rename LS2085A to reflect LS2080AQuoted 4 lines · Prabhakar Kushwaha
From: Pratiyush Mohan Srivastava <[email protected]>
LS2080A is a prime personality of Freescale?s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe
endpoint etc.
Quoted 7 lines
So renaming existing LS2085A code base to reflect LS2080A (Prime personality)
Signed-off-by: Pratiyush Mohan Srivastava
<[email protected]>
---<snip>
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c static struct serdes_config serdes1_cfg_tbl[] = { · line 30
Quoted 11 lines
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c renamed from arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c +0
-0@@ -29,7 +29,7 @@ static struct serdes_config serdes1_cfg_tbl[] = { SGMII1 } }, {0x26, {SGMII8, SGMII7, SGMII6, SGMII5, SGMII4, SGMII3, XFI2, XFI1} },
Quoted 6 lines
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c static struct serdes_config serdes1_cfg_tbl[] = { · line 32
Quoted 3 lines
arch/arm/cpu/armv8/fsl-lsch3/ls2080a_serdes.c renamed from arch/arm/cpu/armv8/fsl-lsch3/ls2085a_serdes.c +1
-1{0x28, {SGMII8, SGMII7, SGMII6, SGMII5, XFI4, XFI3, XFI2, XFI1 } }, - {0x2A, {XFI8, XFI7, XFI6, XFI5, XFI4, XFI3, XFI2, XFI1 } }, + {0x2A, {NONE, NONE, NONE, XFI5, XFI4, XFI3, XFI2, XFI1 } },Is this change related for LS2080 only? Does LS2085 use the first four lanes?
LS2080 supports only 5 MACs whereas LS2085 support 8 MACs
Quoted 3 lines
With this patch, target LS2080AQDS/RDB will support both LS2080 and LS2085, correct?
Yes, objective is to have ls2080aqds/rdb to support both ls2080 and ls2085
--prabhakar
PATCH 1/2 armv8: LS2080A: Rename LS2085A to reflect LS2080A
In reply to Prabhakar KushwahaQuoted 9 lines · Prabhakar Kushwaha
From: Pratiyush Mohan Srivastava <[email protected]>
LS2080A is a prime personality of Freescale?s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe endpoint etc.
So renaming existing LS2085A code base to reflect LS2080A (Prime personality)
Signed-off-by Pratiyush Mohan Srivastava <[email protected]>---
Prabhakar,
Please rebase your patch to latest u-boot.
York
PATCH 1/2 armv8: LS2080A: Rename LS2085A to reflect LS2080A
Quoted 22 lines
-----Original Message-----
From: York Sun [mailto:yorksun at freescale.com]
Sent: Tuesday, November 03, 2015 2:57 AM
To: Kushwaha Prabhakar-B32579 <[email protected]>; u- boot at lists.denx.de
Cc: Srivastava Pratiyush-B46174 <[email protected]>
Subject: Re: [PATCH 1/2] armv8: LS2080A: Rename LS2085A to reflect LS2080AQuoted 4 lines · Prabhakar Kushwaha
From: Pratiyush Mohan Srivastava <[email protected]>
LS2080A is a prime personality of Freescale?s LS2085A. It is a non-AIOP personality without support of DP-DDR, L2 switch, 1588, PCIe
endpoint etc.
Quoted 4 lines
So renaming existing LS2085A code base to reflect LS2080A (Prime personality)
Quoted 8 lines
Quoted 3 lines
Signed-off-by: Pratiyush Mohan Srivastava
<[email protected]>
---Prabhakar,
Please rebase your patch to latest u-boot.
Got it, We will rebase for u-boot-fsl-qoriq
--prabhakar