diff mbox series

[U-Boot,9/9] configs: ls1012a: add pfe configuration for LS1012A

Message ID 1507540304-19982-10-git-send-email-calvin.johnson@nxp.com
State Superseded
Delegated to: Joe Hershberger
Headers show
Series LS1012A PFE driver patch series | expand

Commit Message

Calvin Johnson Oct. 9, 2017, 9:11 a.m. UTC 
Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 configs/ls1012afrdm_qspi_defconfig |  1 +
 configs/ls1012aqds_qspi_defconfig  |  1 +
 configs/ls1012ardb_qspi_defconfig  |  1 +
 drivers/net/Kconfig                |  1 +
 drivers/net/Makefile               |  1 +
 drivers/net/pfe_eth/Kconfig        | 23 ++++++++++++++++++++++-
 include/configs/ls1012a_common.h   |  6 +++---
 include/configs/ls1012afrdm.h      |  7 +++++++
 include/configs/ls1012aqds.h       | 14 ++++++++++++++
 include/configs/ls1012ardb.h       |  8 ++++++++
 10 files changed, 59 insertions(+), 4 deletions(-)

Comments

Prabhakar Kushwaha Dec. 6, 2017, 8:41 a.m. UTC | #1 
> -----Original Message-----
> From: Calvin Johnson [mailto:calvin.johnson@nxp.com]
> Sent: Monday, October 09, 2017 2:42 PM
> To: u-boot@lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; York Sun
> <york.sun@nxp.com>; joe.hershberger@ni.com; Calvin Johnson
> <calvin.johnson@nxp.com>; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> Subject: [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A
> 
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  configs/ls1012afrdm_qspi_defconfig |  1 +
>  configs/ls1012aqds_qspi_defconfig  |  1 +
>  configs/ls1012ardb_qspi_defconfig  |  1 +
>  drivers/net/Kconfig                |  1 +
>  drivers/net/Makefile               |  1 +
>  drivers/net/pfe_eth/Kconfig        | 23 ++++++++++++++++++++++-
>  include/configs/ls1012a_common.h   |  6 +++---
>  include/configs/ls1012afrdm.h      |  7 +++++++
>  include/configs/ls1012aqds.h       | 14 ++++++++++++++
>  include/configs/ls1012ardb.h       |  8 ++++++++
>  10 files changed, 59 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/ls1012afrdm_qspi_defconfig
> b/configs/ls1012afrdm_qspi_defconfig
> index 84b5577..7db7a18 100644
> --- a/configs/ls1012afrdm_qspi_defconfig
> +++ b/configs/ls1012afrdm_qspi_defconfig
> @@ -32,6 +32,7 @@ CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_PFE=y
>  CONFIG_PCI=y
>  CONFIG_DM_PCI=y
>  CONFIG_DM_PCI_COMPAT=y
> diff --git a/configs/ls1012aqds_qspi_defconfig
> b/configs/ls1012aqds_qspi_defconfig
> index 2124273..4b9fdf5 100644
> --- a/configs/ls1012aqds_qspi_defconfig
> +++ b/configs/ls1012aqds_qspi_defconfig
> @@ -37,6 +37,7 @@ CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_PFE=y
>  CONFIG_PCI=y
>  CONFIG_DM_PCI=y
>  CONFIG_DM_PCI_COMPAT=y
> diff --git a/configs/ls1012ardb_qspi_defconfig
> b/configs/ls1012ardb_qspi_defconfig
> index 40349ce..d63e736 100644
> --- a/configs/ls1012ardb_qspi_defconfig
> +++ b/configs/ls1012ardb_qspi_defconfig
> @@ -35,6 +35,7 @@ CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_PFE=y
>  CONFIG_PCI=y
>  CONFIG_DM_PCI=y
>  CONFIG_DM_PCI_COMPAT=y
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 736aab2..c82c63b 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -304,4 +304,5 @@ config FEC2_PHY_NORXERR
>  	  The PHY does not have a RXERR line (RMII only).
>  	  (so program the FEC to ignore it).
> 
> +source "drivers/net/pfe_eth/Kconfig"
>  endif # NETDEVICES
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 94a4fd8..0572cde 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -75,3 +75,4 @@ obj-$(CONFIG_FSL_MEMAC) += fm/memac_phy.o
>  obj-$(CONFIG_VSC9953) += vsc9953.o
>  obj-$(CONFIG_PIC32_ETH) += pic32_mdio.o pic32_eth.o
>  obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
> +obj-$(CONFIG_FSL_PFE) += pfe_eth/
> diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
> index b9996df..c05aeda 100644
> --- a/drivers/net/pfe_eth/Kconfig
> +++ b/drivers/net/pfe_eth/Kconfig
> @@ -1,8 +1,29 @@
> +menuconfig FSL_PFE
> +	bool "Freescale PFE driver"
> +	help
> +	  This driver provides support for Freescale PFE.
> +
> +if FSL_PFE
> +
>  config UTIL_PE_DISABLED
>  	bool
>  	help
>  	  Disable UTIL processor engine of PFE
> 
> -config SYS_FSL_PPFE_ADDR
> +config SYS_FSL_PFE_ADDR
>  	hex "PFE base address"
>  	default 0x04000000
> +
> +config SYS_LS_PFE_FW_ADDR
> +	hex "Flash address of PFE firmware"
> +	default 0x40a00000
> +

Why this parameter in Kconfig. 
This address is hard-coded per platform as defined in standard LSDK flash layout. 

--pk
diff mbox series

Patch

diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
index 84b5577..7db7a18 100644
--- a/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@ -32,6 +32,7 @@  CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_PFE=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index 2124273..4b9fdf5 100644
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -37,6 +37,7 @@  CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_PFE=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
index 40349ce..d63e736 100644
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -35,6 +35,7 @@  CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_PFE=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 736aab2..c82c63b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -304,4 +304,5 @@  config FEC2_PHY_NORXERR
 	  The PHY does not have a RXERR line (RMII only).
 	  (so program the FEC to ignore it).
 
+source "drivers/net/pfe_eth/Kconfig"
 endif # NETDEVICES
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 94a4fd8..0572cde 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -75,3 +75,4 @@  obj-$(CONFIG_FSL_MEMAC) += fm/memac_phy.o
 obj-$(CONFIG_VSC9953) += vsc9953.o
 obj-$(CONFIG_PIC32_ETH) += pic32_mdio.o pic32_eth.o
 obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
+obj-$(CONFIG_FSL_PFE) += pfe_eth/
diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
index b9996df..c05aeda 100644
--- a/drivers/net/pfe_eth/Kconfig
+++ b/drivers/net/pfe_eth/Kconfig
@@ -1,8 +1,29 @@ 
+menuconfig FSL_PFE
+	bool "Freescale PFE driver"
+	help
+	  This driver provides support for Freescale PFE.
+
+if FSL_PFE
+
 config UTIL_PE_DISABLED
 	bool
 	help
 	  Disable UTIL processor engine of PFE
 
-config SYS_FSL_PPFE_ADDR
+config SYS_FSL_PFE_ADDR
 	hex "PFE base address"
 	default 0x04000000
+
+config SYS_LS_PFE_FW_ADDR
+	hex "Flash address of PFE firmware"
+	default 0x40a00000
+
+config DDR_PFE_PHYS_BASEADDR
+	hex "PFE DDR physical base address"
+	default 0x03800000
+
+config DDR_PFE_BASEADDR
+	hex "PFE DDR base address"
+	default 0x83800000
+
+endif
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 52c2c3a..3df5586 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -113,9 +113,9 @@ 
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 root=/dev/ram0 " \
 				"earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
 #undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND		"sf probe 0:0; sf read $kernel_load "\
-					"$kernel_start $kernel_size && "\
-					"bootm $kernel_load"
+#define CONFIG_BOOTCOMMAND	"pfe stop; sf probe 0:0; sf read $kernel_load "\
+				"$kernel_start $kernel_size && "\
+				"bootm $kernel_load"
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 544dea0..a3f8824 100644
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -9,6 +9,13 @@ 
 
 #include "ls1012a_common.h"
 
+#ifdef CONFIG_FSL_PFE
+#define EMAC1_PHY_ADDR          0x2
+#define EMAC2_PHY_ADDR          0x1
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_REALTEK
+#endif
+
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 16714bb..9873339 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -9,6 +9,20 @@ 
 
 #include "ls1012a_common.h"
 
+/* PFE Ethernet */
+#ifdef CONFIG_FSL_PFE
+#define EMAC1_PHY_ADDR          0x1e
+#define EMAC2_PHY_ADDR          0x1
+#define	SGMII_2500_PHY1_ADDR	0x1
+#define	SGMII_2500_PHY2_ADDR	0x2
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_VITESSE
+#define CONFIG_PHY_REALTEK
+#define	CONFIG_PHY_AQUANTIA
+#define	CONFIG_PHYLIB_10G
+#define RGMII_RESET_WA
+#endif
+
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index e47bb7c..e8f42e4 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -9,6 +9,14 @@ 
 
 #include "ls1012a_common.h"
 
+/* PFE Ethernet */
+#ifdef CONFIG_FSL_PFE
+#define EMAC1_PHY_ADDR          0x2
+#define EMAC2_PHY_ADDR          0x1
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_REALTEK
+#endif
+
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1