NXP LS1021A-TSN Board
Subsystems (2)
v2 cover NXP LS1021A-TSN Board
This patchset adds initial support for the NXP LS1021A-TSN board, an evaluation platform built in partnership with VVDN/Argonboards for some IEEE 802.1 TSN features.
It features a cleaned-up U-Boot board support taken from OpenIL, as well as an eTSEC migration to DM_ETH. I picked up Bin Meng's patch that converts the LS1021A-TWR (different board, same SoC):
https://lists.denx.de/pipermail/u-boot/2018-May/330096.html
verified it on the LS1021A-TSN board I am submitting, and made a few adjustments where necessary.
TODO items:
- Make the eTSEC driver support fixed-link interfaces (necessary for the enet2 <-> sja1105 internal port)
- Add driver for SJA1105 switch
- Potentially migrate the eTSEC MDIO bus driver to DM_MDIO and expose the TBI PHY to mdio commands (useful for debugging), once https://lists.denx.de/pipermail/u-boot/2019-June/371563.html
is merged.
Bin Meng (1):
arm: ls1021atwr: Convert to use driver model TSEC driver
Jianchao Wang (1):
Add support for the NXP LS1021A-TSN board
Vladimir Oltean (7):
net: tsec: Refactor the readout of the tbi-handle property
net: tsec: Fix offset of MDIO registers for DM_ETH
net: tsec: Reverse Christmas tree notation
net: tsec: Make errors visible
net: tsec: Common handling of MAC station address for DM_ETH
net: tsec: Change compatible strings to match Linux
configs: ls1021atwr: Fix distro_bootcmd for QSPI boot
arch/arm/Kconfig | 14 + arch/arm/cpu/armv7/ls102xa/cpu.c | 2 +- arch/arm/cpu/armv7/ls102xa/fdt.c | 10 + arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-tsn.dts | 77 +++++ arch/arm/dts/ls1021a-twr.dtsi | 32 ++ arch/arm/dts/ls1021a.dtsi | 30 +- board/freescale/ls1021atsn/Kconfig | 18 ++ board/freescale/ls1021atsn/MAINTAINERS | 8 + board/freescale/ls1021atsn/Makefile | 3 + board/freescale/ls1021atsn/README.rst | 97 ++++++ board/freescale/ls1021atsn/ls1021atsn.c | 259 ++++++++++++++++ board/freescale/ls1021atsn/ls102xa_pbi.cfg | 15 + board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg | 8 + board/freescale/ls1021atwr/ls1021atwr.c | 38 --- configs/ls1021atsn_qspi_defconfig | 77 +++++ configs/ls1021atsn_sdcard_defconfig | 86 ++++++ configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 + configs/ls1021atwr_nor_defconfig | 2 + configs/ls1021atwr_nor_lpuart_defconfig | 2 + configs/ls1021atwr_qspi_defconfig | 2 + ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 2 + configs/ls1021atwr_sdcard_ifc_defconfig | 2 + configs/ls1021atwr_sdcard_qspi_defconfig | 2 + doc/device-tree-bindings/net/fsl-tsec-phy.txt | 4 +- drivers/net/tsec.c | 59 ++-- include/configs/ls1021atsn.h | 289 ++++++++++++++++++ include/configs/ls1021atwr.h | 30 +- include/tsec.h | 4 +- 29 files changed, 1069 insertions(+), 107 deletions(-) create mode 100644 arch/arm/dts/ls1021a-tsn.dts create mode 100644 board/freescale/ls1021atsn/Kconfig create mode 100644 board/freescale/ls1021atsn/MAINTAINERS create mode 100644 board/freescale/ls1021atsn/Makefile create mode 100644 board/freescale/ls1021atsn/README.rst create mode 100644 board/freescale/ls1021atsn/ls1021atsn.c create mode 100644 board/freescale/ls1021atsn/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg create mode 100644 configs/ls1021atsn_qspi_defconfig create mode 100644 configs/ls1021atsn_sdcard_defconfig create mode 100644 include/configs/ls1021atsn.h
Signature · 1 line
2.17.1
PATCH v2 1/9 net: tsec: Refactor the readout of the tbi-handle property
The point of this patch is to eliminate the use of the locally-defined "reg" variable (which interferes with next patch) and simplify the fallback to the default CONFIG_SYS_TBIPA_VALUE in case "tbi-handle" is missing.
---
Changes from v1:
None.
drivers/net/tsec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/tsec.c +7 -8
@@ -798,6 +798,7 @@ int tsec_probe(struct udevice *dev)struct eth_pdata *pdata =dev_get_platdata (dev);struct fsl_pq_mdio_info mdio_info;struct ofnode_phandle_args phandle_args; +u32 tbiaddr =CONFIG_SYS_TBIPA_VALUE ;ofnode parent;const char *phy_mode;int ret;
@@ -825,14 +826,12 @@ int tsec_probe(struct udevice *dev)return -ENOENT ; } -if (dev_read_phandle_with_args (dev,"tbi-handle" ,NULL ,0 ,0 , - &phandle_args)) { - priv->tbiaddr =CONFIG_SYS_TBIPA_VALUE ; - }else { -int reg =ofnode_read_u32_default (phandle_args.node,"reg" , -CONFIG_SYS_TBIPA_VALUE ); - priv->tbiaddr = reg; - } + ret =dev_read_phandle_with_args (dev,"tbi-handle" ,NULL ,0 ,0 , + &phandle_args); +if (ret ==0 ) +ofnode_read_u32 (phandle_args.node,"reg" , &tbiaddr); + + priv->tbiaddr = tbiaddr; phy_mode =dev_read_prop (dev,"phy-connection-type" ,NULL );if (phy_mode)
Signature · 1 line
2.17.1
PATCH v2 2/9 net: tsec: Fix offset of MDIO registers for DM_ETH
In reply to Vladimir OlteanBy convention, the eTSEC MDIO controller nodes are defined in DT at 0x2d24000 and 0x2d50000, but actually U-Boot does not touch the interrupt portion of the register map (MDIO_IEVENTM, MDIO_IMASKM, MDIO_EMAPM).
That leaves only the MDIO bus registers (MDIO_MIIMCFG, MDIO_MIIMCOM, MDIO_MIIMADD, MDIO_MIIMADD, MDIO_MIIMCON, MDIO_MIIMSTAT) which start at the 0x520 offset.
So shift the DT-defined register map by the offset of MDIO_MIIMCFG when mapping the MDIO bus registers.
---
Changes from v1:
None.
drivers/net/tsec.c | 13 +++++++------ include/tsec.h | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/net/tsec.c +7 -6
@@ -801,6 +801,7 @@ int tsec_probe(struct udevice *dev)u32 tbiaddr =CONFIG_SYS_TBIPA_VALUE ;ofnode parent;const char *phy_mode; +fdt_addr_t reg;int ret; pdata->iobase = (phys_addr_t )dev_read_addr (dev);
@@ -817,15 +818,15 @@ int tsec_probe(struct udevice *dev) } parent =ofnode_get_parent (phandle_args.node); -if (ofnode_valid (parent)) { -int reg =ofnode_get_addr_index (parent,0 ); - - priv->phyregs_sgmii = (struct tsec_mii_mng *)reg; - }else { -debug ("No parent node for PHY?\n" ); +if (!ofnode_valid (parent)) { +printf ("No parent node for PHY?\n" );return -ENOENT ; } + reg =ofnode_get_addr_index (parent,0 ); + priv->phyregs_sgmii = (struct tsec_mii_mng *) + (reg +TSEC_MDIO_REGS_OFFSET ); + ret =dev_read_phandle_with_args (dev,"tbi-handle" ,NULL ,0 ,0 , &phandle_args);if (ret ==0 )
include/tsec.h +3 -1
@@ -17,6 +17,8 @@#include <config.h> #include <phy.h> +#define TSEC_MDIO_REGS_OFFSET 0x520 +#ifndef CONFIG_DM_ETH #ifdef CONFIG_ARCH_LS1021A
@@ -27,7 +29,7 @@#define TSEC_MDIO_OFFSET 0x01000#endif -#define CONFIG_SYS_MDIO_BASE_ADDR (MDIO_BASE_ADDR + 0x520) +#define CONFIG_SYS_MDIO_BASE_ADDR (MDIO_BASE_ADDR + TSEC_MDIO_REGS_OFFSET)#define TSEC_GET_REGS (num, offset) \ (struct tsec __iomem *)\
Signature · 1 line
2.17.1
PATCH v2 2/9 net: tsec: Fix offset of MDIO registers for DM_ETH
Quoted 14 lines · Vladimir Oltean
By convention, the eTSEC MDIO controller nodes are defined in DT at
0x2d24000and0x2d50000, but actually U-Boot does not touch the interrupt portion of the register map (MDIO_IEVENTM,MDIO_IMASKM,MDIO_EMAPM).That leaves only the MDIO bus registers (
MDIO_MIIMCFG,MDIO_MIIMCOM,MDIO_MIIMADD,MDIO_MIIMADD,MDIO_MIIMCON,MDIO_MIIMSTAT) which start at the0x520offset.So shift the DT-defined register map by the offset of
MDIO_MIIMCFGwhen mapping the MDIO bus registers.Signed-off-by Vladimir Oltean <[email protected]>
Quoted 9 lines
---
Changes from v1:None.
drivers/net/tsec.c | 13 +++++++------ include/tsec.h | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-)
PATCH v2 3/9 net: tsec: Reverse Christmas tree notation
In reply to Vladimir OlteanThis is a cosmetic patch that reorders variable definitions in the inverse order of their line length, where possible.
---
Changes from v1:
None.
drivers/net/tsec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/tsec.c +5 -5
@@ -259,8 +259,8 @@ static int tsec_send(struct udevice *dev, void *packet, int length) {struct tsec_private *priv = (struct tsec_private *)dev->priv;struct tsec __iomem *regs = priv->regs; -u16 status;int result =0 ; +u16 status;int i;/* Find an empty buffer descriptor */
@@ -708,9 +708,9 @@ static int init_phy(struct tsec_private *priv)*/ static int tsec_initialize (bd_t *bis,struct tsec_info_struct *tsec_info) { +struct tsec_private *priv;struct eth_device *dev;int i; -struct tsec_private *priv; dev = (struct eth_device *)malloc (sizeof (*dev));
@@ -794,14 +794,14 @@ int tsec_standard_init(bd_t *bis)#else /* CONFIG_DM_ETH */ int tsec_probe (struct udevice *dev) { -struct tsec_private *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_platdata (dev); -struct fsl_pq_mdio_info mdio_info; +struct tsec_private *priv =dev_get_priv (dev);struct ofnode_phandle_args phandle_args;u32 tbiaddr =CONFIG_SYS_TBIPA_VALUE ; -ofnode parent; +struct fsl_pq_mdio_info mdio_info;const char *phy_mode;fdt_addr_t reg; +ofnode parent;int ret; pdata->iobase = (phys_addr_t )dev_read_addr (dev);
Signature · 1 line
2.17.1
PATCH v2 4/9 net: tsec: Make errors visible
In reply to Vladimir OlteanThis replaces debug() calls with printf() so that it is immediately obvious from the console that something is wrong.
---
Changes from v1:
None.
drivers/net/tsec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/tsec.c +4 -4
@@ -268,7 +268,7 @@ static int tsec_send(struct udevice *dev, void *packet, int length)in_be16 (&priv->txbd[priv->tx_idx].status) &TXBD_READY ; i++) {if (i >=TOUT_LOOP ) { -debug ("%s: tsec: tx buffers full\n" , dev->name); +printf ("%s: tsec: tx buffers full\n" , dev->name);return result; } }
@@ -287,7 +287,7 @@ static int tsec_send(struct udevice *dev, void *packet, int length)in_be16 (&priv->txbd[priv->tx_idx].status) &TXBD_READY ; i++) {if (i >=TOUT_LOOP ) { -debug ("%s: tsec: tx error\n" , dev->name); +printf ("%s: tsec: tx error\n" , dev->name);return result; } }
@@ -809,7 +809,7 @@ int tsec_probe(struct udevice *dev)if (dev_read_phandle_with_args (dev,"phy-handle" ,NULL ,0 ,0 , &phandle_args)) { -debug ("phy-handle does not exist under tsec %s\n" , dev->name); +printf ("phy-handle does not exist under tsec %s\n" , dev->name);return -ENOENT ; }else {int reg =ofnode_read_u32_default (phandle_args.node,"reg" ,0 );
@@ -838,7 +838,7 @@ int tsec_probe(struct udevice *dev)if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) { -debug ("Invalid PHY interface '%s'\n" , phy_mode); +printf ("Invalid PHY interface '%s'\n" , phy_mode);return -EINVAL ; } priv->interface = pdata->phy_interface;
Signature · 1 line
2.17.1
PATCH v2 5/9 net: tsec: Common handling of MAC station address for DM_ETH
In reply to Vladimir OlteanIn tsec_init, the MAC address is retrieved from 2 different structures depending on whether DM_ETH is enabled or not.
But since the field name is the same inside both structures, we can conditionally define the structure of the correct type and simplify the assignments.
---
Changes from v1:
None.
drivers/net/tsec.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/net/tsec.c +2 -9
@@ -560,6 +560,8 @@ static int tsec_init(struct udevice *dev)struct tsec_private *priv = (struct tsec_private *)dev->priv;#ifdef CONFIG_DM_ETH struct eth_pdata *pdata =dev_get_platdata (dev); +#else +struct eth_device *pdata = dev;#endif struct tsec __iomem *regs = priv->regs;u32 tempval;
@@ -580,21 +582,12 @@ static int tsec_init(struct udevice *dev)* order (BE), MACnADDR1 is set to 0xCDAB7856 and * MACnADDR2 is set to 0x34120000. */ -#ifndef CONFIG_DM_ETH - tempval = (dev->enetaddr[5 ] <<24 ) | (dev->enetaddr[4 ] <<16 ) | - (dev->enetaddr[3 ] <<8 ) | dev->enetaddr[2 ]; -#else tempval = (pdata->enetaddr[5 ] <<24 ) | (pdata->enetaddr[4 ] <<16 ) | (pdata->enetaddr[3 ] <<8 ) | pdata->enetaddr[2 ]; -#endif out_be32 (®s->macstnaddr1, tempval); -#ifndef CONFIG_DM_ETH - tempval = (dev->enetaddr[1 ] <<24 ) | (dev->enetaddr[0 ] <<16 ); -#else tempval = (pdata->enetaddr[1 ] <<24 ) | (pdata->enetaddr[0 ] <<16 ); -#endif out_be32 (®s->macstnaddr2, tempval);
Signature · 1 line
2.17.1
PATCH v2 6/9 net: tsec: Change compatible strings to match Linux
In reply to Vladimir OlteanIn the case of the tsec network driver, so far there has been no mainline user of DM_ETH where the DT bindings get used.
In the case of the mdio bus, it looks like the "fsl,tsec-mdio" string was made up for the documentation, but there is no mainline code that parses the "compatible" property anyway.
In both cases, there are no DT blobs that contain the old strings.
So change the documentation to "fsl,etsec2" for the Ethernet ports and "fsl,etsec2-mdio" for the MDIO buses, which are strings that Linux also uses, at least for LS1021A. More compatible strings can be added once other (PowerPC) SoCs are migrated to DM_ETH.
The current ls1021a.dtsi doesn't match what was documented for the MDIO buses anyway (the "compatible" is "gianfar" currently). This will be fixed in the next patch.
---
Changes from v1:
Patch is new.
doc/device-tree-bindings/net/fsl-tsec-phy.txt | 4 ++-- drivers/net/tsec.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
doc/device-tree-bindings/net/fsl-tsec-phy.txt +2 -2
@@ -28,13 +28,13 @@ device that exists on this bus, a PHY node should be created. Required properties: - compatible : Should define the compatible device type for the - mdio. Currently supported string/device is "fsl,tsec-mdio". + mdio. Currently supported string/device is "fsl,etsec2-mdio". - reg : Offset and length of the register set for the device Example: mdio at 24520 { - compatible = "fsl,tsec-mdio"; + compatible = "fsl,etsec2-mdio"; reg = <0x24520 0x20>; ethernet-phy at 0 {
drivers/net/tsec.c +1 -1
@@ -880,7 +880,7 @@ static const struct eth_ops tsec_ops = { };static const struct udevice_id tsec_ids[] = { - { .compatible ="fsl,tsec" }, + { .compatible ="fsl,etsec2" }, { } };
Signature · 1 line
2.17.1
PATCH v2 6/9 net: tsec: Change compatible strings to match Linux
Quoted 21 lines · Vladimir Oltean
In the case of the tsec network driver, so far there has been no mainline user of
DM_ETHwhere the DT bindings get used.In the case of the mdio bus, it looks like the "fsl,tsec-mdio" string was made up for the documentation, but there is no mainline code that parses the "compatible" property anyway.
In both cases, there are no DT blobs that contain the old strings.
So change the documentation to "fsl,etsec2" for the Ethernet ports and "fsl,etsec2-mdio" for the MDIO buses, which are strings that Linux also uses, at least for LS1021A. More compatible strings can be added once other (PowerPC) SoCs are migrated to
DM_ETH.The current
ls1021a.dtsidoesn't match what was documented for the MDIO buses anyway (the "compatible" is "gianfar" currently). This will be fixed in the next patch.Fixes 69a00875e3db ("doc: dt-bindings: Describe Freescale TSEC ethernet controller")Signed-off-by Vladimir Oltean <[email protected]>
Quoted 9 lines
---
Changes from v1:Patch is new.
doc/device-tree-bindings/net/fsl-tsec-phy.txt | 4 ++-- drivers/net/tsec.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
PATCH v2 7/9 arm: ls1021atwr: Convert to use driver model TSEC driver
In reply to Vladimir OlteanFrom: Bin Meng <[email protected]>
Now that we have added driver model support to the TSEC driver, convert ls1021atwr board to use it.
This depends on previous DM series for ls1021atwr:
http://patchwork.ozlabs.org/patch/561855/
[Vladimir] Made the following changes:
- Added 'status = "disabled";' for all Ethernet ports in ls1021a.dtsi
- Fixed the confusion between the SGMII/TBI PCS for enet0 and enet1 - a mistake ported over from Linux. Each SGMII PCS lies on the private MDIO bus of the interface (and the RGMII enet2 has no SGMII PCS).
- Added CONFIG_DM_ETH to all ls1021atwr_* defconfigs
- Completely removed non-DM_ETH support from ls1021atwr
- Changed "compatible" string from "fsl,tsec-mdio" to "fsl,etsec2-mdio" and from "fsl,tsec" to "fsl,etsec2" to match Linux
---
Changes from v1:
Applied non-reverse #ifdef logic where possible. Removed the non-DM_ETH code from board/freescale/ls1021atwr/ and include/configs/ls1021atwr.h.
Aligned compatible strings to Linux.
arch/arm/cpu/armv7/ls102xa/cpu.c | 2 +- arch/arm/cpu/armv7/ls102xa/fdt.c | 10 +++++ arch/arm/dts/ls1021a-twr.dtsi | 32 ++++++++++++++++ arch/arm/dts/ls1021a.dtsi | 30 +++++++++++++-- board/freescale/ls1021atwr/ls1021atwr.c | 38 ------------------- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 + configs/ls1021atwr_nor_defconfig | 2 + configs/ls1021atwr_nor_lpuart_defconfig | 2 + configs/ls1021atwr_qspi_defconfig | 2 + ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 2 + configs/ls1021atwr_sdcard_ifc_defconfig | 2 + configs/ls1021atwr_sdcard_qspi_defconfig | 2 + include/configs/ls1021atwr.h | 28 +------------- 13 files changed, 85 insertions(+), 69 deletions(-)
arch/arm/cpu/armv7/ls102xa/cpu.c +1 -1
@@ -296,7 +296,7 @@ int cpu_mmc_init(bd_t *bis)int cpu_eth_init (bd_t *bis) { -#ifdef CONFIG_TSEC_ENET +#if defined(CONFIG_TSEC_ENET ) && !defined(CONFIG_DM_ETH )tsec_standard_init (bis);#endif
arch/arm/cpu/armv7/ls102xa/fdt.c +10 -0
@@ -16,12 +16,17 @@#include <tsec.h> #include <asm/arch/immap_ls102xa.h> #include <fsl_sec.h> +#include <dm.h> DECLARE_GLOBAL_DATA_PTR ;void ft_fixup_enet_phy_connect_type (void *fdt) { +#ifdef CONFIG_DM_ETH +struct udevice *dev; +#else struct eth_device *dev; +#endif struct tsec_private *priv;const char *enet_path, *phy_path;char enet[16 ];
@@ -29,7 +34,12 @@ void ft_fixup_enet_phy_connect_type(void *fdt)int phy_node;int i =0 ;uint32_t ph; +#ifdef CONFIG_DM_ETH +char *name[3 ] = {"ethernet at 2d10000" ,"ethernet at 2d50000" , +"ethernet at 2d90000" }; +#else char *name[3 ] = {"eTSEC1" ,"eTSEC2" ,"eTSEC3" }; +#endif for (; i <ARRAY_SIZE (name); i++) { dev =eth_get_dev_by_name (name[i]);
arch/arm/dts/ls1021a-twr.dtsi +32 -0
@@ -51,6 +51,26 @@ }; }; +&enet0 { + tbi-handle = <&tbi0>; + phy-handle = <&sgmii_phy2>; + phy-connection-type = "sgmii"; + status = "okay"; +}; + +&enet1 { + tbi-handle = <&tbi1>; + phy-handle = <&sgmii_phy0>; + phy-connection-type = "sgmii"; + status = "okay"; +}; + +&enet2 { + phy-handle = <&rgmii_phy1>; + phy-connection-type = "rgmii-id"; + status = "okay"; +}; + &i2c0 { status = "okay"; };
@@ -84,12 +104,24 @@ sgmii_phy0: ethernet-phy at 0 { reg = <0x0>; }; + rgmii_phy1: ethernet-phy at 1 { reg = <0x1>; }; + sgmii_phy2: ethernet-phy at 2 { reg = <0x2>; }; + + /* SGMII PCS for enet0 */ + tbi0: tbi-phy at 1f { + reg = <0x1f>; + device_type = "tbi-phy"; + }; +}; + +&mdio1 { + /* SGMII PCS for enet1 */ tbi1: tbi-phy at 1f { reg = <0x1f>; device_type = "tbi-phy";
arch/arm/dts/ls1021a.dtsi +27 -3
@@ -350,12 +350,36 @@ <&platform_clk 1>; }; + enet0: ethernet at 2d10000 { + compatible = "fsl,etsec2"; + reg = <0x2d10000 0x1000>; + status = "disabled"; + }; + + enet1: ethernet at 2d50000 { + compatible = "fsl,etsec2"; + reg = <0x2d50000 0x1000>; + status = "disabled"; + }; + + enet2: ethernet at 2d90000 { + compatible = "fsl,etsec2"; + reg = <0x2d90000 0x1000>; + status = "disabled"; + }; + mdio0: mdio at 2d24000 { - compatible = "gianfar"; - device_type = "mdio"; + compatible = "fsl,etsec2-mdio"; + reg = <0x2d24000 0x4000>; + #address-cells = <1>; + #size-cells = <0>; + }; + + mdio1: mdio at 2d64000 { + compatible = "fsl,etsec2-mdio"; + reg = <0x2d64000 0x4000>; #address-cells = <1>; #size-cells = <0>; - reg = <0x2d24000 0x4000>; }; usb at 8600000 {
board/freescale/ls1021atwr/ls1021atwr.c +0 -38
@@ -248,44 +248,6 @@ int board_mmc_init(bd_t *bis)int board_eth_init (bd_t *bis) { -#ifdef CONFIG_TSEC_ENET -struct fsl_pq_mdio_info mdio_info; -struct tsec_info_struct tsec_info[4 ]; -int num =0 ; - -#ifdef CONFIG_TSEC1 -SET_STD_TSEC_INFO (tsec_info[num],1 ); -if (is_serdes_configured (SGMII_TSEC1 )) { -puts ("eTSEC1 is in sgmii mode.\n" ); - tsec_info[num].flags |=TSEC_SGMII ; - } - num++; -#endif -#ifdef CONFIG_TSEC2 -SET_STD_TSEC_INFO (tsec_info[num],2 ); -if (is_serdes_configured (SGMII_TSEC2 )) { -puts ("eTSEC2 is in sgmii mode.\n" ); - tsec_info[num].flags |=TSEC_SGMII ; - } - num++; -#endif -#ifdef CONFIG_TSEC3 -SET_STD_TSEC_INFO (tsec_info[num],3 ); - tsec_info[num].interface =PHY_INTERFACE_MODE_RGMII_ID ; - num++; -#endif -if (!num) { -printf ("No TSECs initialized\n" ); -return 0 ; - } - - mdio_info.regs = (struct tsec_mii_mng *)CONFIG_SYS_MDIO_BASE_ADDR ; - mdio_info.name =DEFAULT_MII_NAME ; -fsl_pq_mdio_init (bis, &mdio_info); - -tsec_eth_init (bis, tsec_info, num); -#endif -return pci_eth_init (bis); }
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +2 -0
@@ -40,7 +40,9 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
configs/ls1021atwr_nor_defconfig +2 -0
@@ -40,7 +40,9 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
configs/ls1021atwr_nor_lpuart_defconfig +2 -0
@@ -42,7 +42,9 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
configs/ls1021atwr_qspi_defconfig +2 -0
@@ -42,7 +42,9 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +2 -0
@@ -53,7 +53,9 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
configs/ls1021atwr_sdcard_ifc_defconfig +2 -0
@@ -54,7 +54,9 @@ CONFIG_SYS_FLASH_CFI=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
configs/ls1021atwr_sdcard_qspi_defconfig +2 -0
@@ -53,7 +53,9 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_GIGE=y CONFIG_E1000=y CONFIG_MII=y +CONFIG_DM_ETH=y CONFIG_TSEC_ENET=y +CONFIG_PHY_ATHEROS=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y
include/configs/ls1021atwr.h +1 -27
@@ -260,33 +260,7 @@*/ #ifdef CONFIG_TSEC_ENET -#define CONFIG_MII_DEFAULT_TSEC 1 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" -#define CONFIG_TSEC2 1 -#define CONFIG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" - -#define TSEC1_PHY_ADDR 2 -#define TSEC2_PHY_ADDR 0 -#define TSEC3_PHY_ADDR 1 - -#define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC2_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) -#define TSEC3_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) - -#define TSEC1_PHYIDX 0 -#define TSEC2_PHYIDX 0 -#define TSEC3_PHYIDX 0 - -#define CONFIG_ETHPRIME "eTSEC1" - -#define CONFIG_PHY_ATHEROS - -#define CONFIG_HAS_ETH0 -#define CONFIG_HAS_ETH1 -#define CONFIG_HAS_ETH2 +#define CONFIG_ETHPRIME "ethernet at 2d10000"#endif /* PCIe */
Signature · 1 line
2.17.1
PATCH v2 8/9 configs: ls1021atwr: Fix distro_bootcmd for QSPI boot
In reply to Vladimir OlteanDue to a typo, "run qspi_bootcmd" and "env exists secureboot" got concatenated instead of being separated by a semicolon.
---
Changes from v1:
None.
include/configs/ls1021atwr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/configs/ls1021atwr.h +1 -1
@@ -418,7 +418,7 @@#undef CONFIG_BOOTCOMMAND#if defined(CONFIG_QSPI_BOOT ) || defined(CONFIG_SD_BOOT_QSPI ) -#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd" \ +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ "env exists secureboot && esbc_halt"#elif defined(CONFIG_SD_BOOT )#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run sd_bootcmd; " \
Signature · 1 line
2.17.1
PATCH v2 8/9 configs: ls1021atwr: Fix distro_bootcmd for QSPI boot
Quoted 6 lines · Vladimir Oltean
Due to a typo, "run
qspi_bootcmd" and "env exists secureboot" got concatenated instead of being separated by a semicolon.Signed-off-by Vladimir Oltean <[email protected]>Reviewed-by Bin Meng <[email protected]>
PATCH v2 9/9 Add support for the NXP LS1021A-TSN board
In reply to Vladimir OlteanFrom: Jianchao Wang <[email protected]>
The LS1021A-TSN is a development board built by VVDN/Argonboards in partnership with NXP.
It features the LS1021A SoC and the first-generation SJA1105T Ethernet switch for prototyping implementations of a subset of IEEE 802.1 TSN standards.
Supported boot media: microSD card (via SPL), QSPI flash.
Rev. A of the board uses a Spansion S25FL512S_256K serial flash, which is 64 MB in size and has an erase sector size of 256KB (therefore, flashing the RCW would erase part of U-Boot).
Rev. B and C of the board use a Spansion S25FL256S1 serial flash, which is only 32 MB in size but has an erase sector size of 64KB (therefore the RCW image can be flashed without erasing U-Boot).
To avoid the problems above, the U-Boot base address has been selected at 0x100000 (the start of the 5th 256KB erase sector), which works for all board revisions. Actually 0x40000 would have been enough, but 0x100000 is common for all Layerscape devices.
eTSEC3 is connecting directly to SJA1105 via an RGMII fixed-link, but SJA1105 is currently not supported by uboot. Therefore, eTSEC3 is disabled.
[Vladimir] Code taken from https://github.com/openil/u-boot (which itself is mostly copied from ls1021a-iot) and adapted with the following changes:
- Add a008850 errata workaround
- Converted eTSEC, MMC to DM to avoid all build warnings
- Plugged in distro boot feature, including support for extlinux.conf
- Added defconfig for QSPI boot
- Added the board/freescale/ls1021atsn/README.rst for initial setup
- Increased CONFIG_SYS_MONITOR_LEN so that the SPL malloc pool does not get overwritten during copying of the u-boot.bin payload from MMC to DDR.
---
Changes from v1:
Increased CONFIG_SYS_MONITOR_LEN so that the SPL malloc pool does not get overwritten during copying of the u-boot.bin payload from MMC to DDR.
Completely removed all traces of IFC support (for CPLD control), which has no chance of working on this board.
Made ddrmc_init a static function.
arch/arm/Kconfig | 14 + arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-tsn.dts | 77 +++++ board/freescale/ls1021atsn/Kconfig | 18 ++ board/freescale/ls1021atsn/MAINTAINERS | 8 + board/freescale/ls1021atsn/Makefile | 3 + board/freescale/ls1021atsn/README.rst | 97 ++++++ board/freescale/ls1021atsn/ls1021atsn.c | 259 ++++++++++++++++ board/freescale/ls1021atsn/ls102xa_pbi.cfg | 15 + board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg | 8 + configs/ls1021atsn_qspi_defconfig | 77 +++++ configs/ls1021atsn_sdcard_defconfig | 86 ++++++ include/configs/ls1021atsn.h | 289 ++++++++++++++++++ 13 files changed, 952 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/ls1021a-tsn.dts create mode 100644 board/freescale/ls1021atsn/Kconfig create mode 100644 board/freescale/ls1021atsn/MAINTAINERS create mode 100644 board/freescale/ls1021atsn/Makefile create mode 100644 board/freescale/ls1021atsn/README.rst create mode 100644 board/freescale/ls1021atsn/ls1021atsn.c create mode 100644 board/freescale/ls1021atsn/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg create mode 100644 configs/ls1021atsn_qspi_defconfig create mode 100644 configs/ls1021atsn_sdcard_defconfig create mode 100644 include/configs/ls1021atsn.h
arch/arm/Kconfig +14 -0
@@ -1337,6 +1337,19 @@ config TARGET_LS1021ATWR select SUPPORT_SPL imply SCSI +config TARGET_LS1021ATSN + bool "Support ls1021atsn" + select ARCH_LS1021A + select ARCH_SUPPORT_PSCI + select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT + select CPU_V7A + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT + select LS1_DEEP_SLEEP + select SUPPORT_SPL + imply SCSI + config TARGET_LS1021AIOT bool "Support ls1021aiot" select ARCH_LS1021A
@@ -1713,6 +1726,7 @@ source "board/freescale/ls1028a/Kconfig" source "board/freescale/ls1021aqds/Kconfig" source "board/freescale/ls1043aqds/Kconfig" source "board/freescale/ls1021atwr/Kconfig" +source "board/freescale/ls1021atsn/Kconfig" source "board/freescale/ls1021aiot/Kconfig" source "board/freescale/ls1046aqds/Kconfig" source "board/freescale/ls1043ardb/Kconfig"
arch/arm/dts/Makefile +1 -1
@@ -326,7 +326,7 @@ dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \ ls1021a-qds-lpuart.dtb \ ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \ - ls1021a-iot-duart.dtb + ls1021a-iot-duart.dtb ls1021a-tsn.dtb dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-rdb.dtb \ fsl-ls2081a-rdb.dtb \
arch/arm/dts/ls1021a-tsn.dts new file +77 -0
77 lines not on this page · raw message
board/freescale/ls1021atsn/Kconfig new file +18 -0
@@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0 +if TARGET_LS1021ATSN + +config SYS_BOARD + default "ls1021atsn" + +config SYS_VENDOR + default "freescale" + +config SYS_SOC + default "ls102xa" + +config SYS_CONFIG_NAME + default "ls1021atsn" + +source "board/freescale/common/Kconfig" + +endif
board/freescale/ls1021atsn/MAINTAINERS new file +8 -0
@@ -0,0 +1,8 @@ +NXP LS1021A-TSN Board +M: Vladimir Oltean <[email protected]> +S: Maintained +F: arch/arm/dts/ls1021a-tsn.dts +F: board/freescale/ls1021atsn/ +F: include/configs/ls1021atsn.h +F: configs/ls1021atsn_qspi_defconfig +F: configs/ls1021atsn_sdcard_defconfig
board/freescale/ls1021atsn/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += ls1021atsn.o +obj-$(CONFIG_ARMV7_PSCI) += ../ls1021atwr/psci.o
board/freescale/ls1021atsn/README.rst new file +97 -0
97 lines not on this page · raw message
board/freescale/ls1021atsn/ls1021atsn.c new file +259 -0
259 lines not on this page · raw message
board/freescale/ls1021atsn/ls102xa_pbi.cfg new file +15 -0
@@ -0,0 +1,15 @@ +# PBI commands + +09570200 ffffffff +09570158 00000300 +8940007c 21f47300 + +# Configure Scratch register +09ee0200 10000000 +# Configure alternate space +09570158 00001000 +# Flush PBL data +096100c0 000FFFFF + +09ea085c 00502880 +09ea0560 80800000
board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg new file +8 -0
@@ -0,0 +1,8 @@ +# PBL preamble and RCW header +aa55aa55 01ee0100 + +# Disable IFC, enable QSPI and DSPI +0608000c 00000000 00000000 00000000 +30000000 08007900 40105a00 21046000 +00000000 00000000 00000000 10002000 +20124801 8804b340 00000000 00000000
configs/ls1021atsn_qspi_defconfig new file +77 -0
77 lines not on this page · raw message
configs/ls1021atsn_sdcard_defconfig new file +86 -0
86 lines not on this page · raw message
include/configs/ls1021atsn.h new file +289 -0
289 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 9/9 Add support for the NXP LS1021A-TSN board
Quoted 74 lines · Vladimir Oltean
From: Jianchao Wang <[email protected]>
The LS1021A-TSN is a development board built by VVDN/Argonboards in partnership with NXP.
It features the LS1021A SoC and the first-generation SJA1105T Ethernet switch for prototyping implementations of a subset of IEEE 802.1 TSN standards.
Supported boot media: microSD card (via SPL), QSPI flash.
Rev. A of the board uses a Spansion
S25FL512S_256Kserial flash, which is 64 MB in size and has an erase sector size of 256KB (therefore, flashing the RCW would erase part of U-Boot).Rev. B and C of the board use a Spansion S25FL256S1 serial flash, which is only 32 MB in size but has an erase sector size of 64KB (therefore the RCW image can be flashed without erasing U-Boot).
To avoid the problems above, the U-Boot base address has been selected at
0x100000(the start of the 5th 256KB erase sector), which works for all board revisions. Actually0x40000would have been enough, but0x100000is common for all Layerscape devices.eTSEC3 is connecting directly to SJA1105 via an RGMII fixed-link, but SJA1105 is currently not supported by uboot. Therefore, eTSEC3 is disabled.
Signed-off-by Xiaoliang Yang <[email protected]>Signed-off-by Mingkai Hu <[email protected]>Signed-off-by Jianchao Wang <[email protected]>Signed-off-by Changming Huang <[email protected]>Signed-off-by Vladimir Oltean <[email protected]>[Vladimir] Code taken from https://github.com/openil/u-boot (which itself is mostly copied from ls1021a-iot) and adapted with the following changes:
- Add a008850 errata workaround
- Converted eTSEC, MMC to DM to avoid all build warnings
- Plugged in distro boot feature, including support for extlinux.conf
- Added defconfig for QSPI boot
- Added theboard/freescale/ls1021atsn/README.rstfor initial setup
- IncreasedCONFIG_SYS_MONITOR_LENso that the SPL malloc pool does not get overwritten during copying of the u-boot.bin payload from MMC to DDR.
---
Changes from v1:Increased
CONFIG_SYS_MONITOR_LENso that the SPL malloc pool does not get overwritten during copying of the u-boot.bin payload from MMC to DDR.
Completely removed all traces of IFC support (for CPLD control), which has no chance of working on this board.
Madeddrmc_inita static function.arch/arm/Kconfig | 14 + arch/arm/dts/Makefile | 2 +- arch/arm/dts/ls1021a-tsn.dts | 77 +++++ board/freescale/ls1021atsn/Kconfig | 18 ++ board/freescale/ls1021atsn/MAINTAINERS | 8 + board/freescale/ls1021atsn/Makefile | 3 + board/freescale/ls1021atsn/README.rst | 97 ++++++ board/freescale/ls1021atsn/ls1021atsn.c | 259 ++++++++++++++++ board/freescale/ls1021atsn/ls102xa_pbi.cfg | 15 + board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg | 8 + configs/ls1021atsn_qspi_defconfig | 77 +++++ configs/ls1021atsn_sdcard_defconfig | 86 ++++++ include/configs/ls1021atsn.h | 289 ++++++++++++++++++ 13 files changed, 952 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/ls1021a-tsn.dts create mode 100644 board/freescale/ls1021atsn/Kconfig create mode 100644 board/freescale/ls1021atsn/MAINTAINERS
Quoted 9 lines
create mode 100644 board/freescale/ls1021atsn/Makefile create mode 100644 board/freescale/ls1021atsn/README.rst create mode 100644 board/freescale/ls1021atsn/ls1021atsn.c create mode 100644 board/freescale/ls1021atsn/ls102xa_pbi.cfg create mode 100644 board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg create mode 100644 configs/ls1021atsn_qspi_defconfig create mode 100644 configs/ls1021atsn_sdcard_defconfig create mode 100644 include/configs/ls1021atsn.h