NXP arm64 add TLV mtd hw-info partitions for onie-syseeprom

boards: ls1043ardb, ls1046ardb, ls1088ardb,and ls208xardb

Use a 256KB region at the end of NOR/QSPI flash bank to allow
re-flashing standard 35MB LSDK without distroying hw-info.

Add partition names for the other firmware components.

Signed-off-by: Ed Swarthout <[email protected]>
Signed-off-by: Curt Brune <[email protected]>

12 files changed, 359 insertions, 4 deletions

diff --git a/machine/nxp/nxp_ls1043ardb/busybox/conf/config b/machine/nxp/nxp_ls1043ardb/busybox/conf/config
index 0e82ba19..5ec59e6b 100644
--- a/machine/nxp/nxp_ls1043ardb/busybox/conf/config
+++ b/machine/nxp/nxp_ls1043ardb/busybox/conf/config
@@ -1,6 +1,6 @@
 CONFIG_SYS_EEPROM=y
 CONFIG_SYS_EEPROM_DEVICE_MTD=y
-CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-board_eeprom"
+CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-hw-info"
 CONFIG_SYS_EEPROM_OFFSET=0
 CONFIG_SYS_EEPROM_SIZE=2048
 CONFIG_SYS_EEPROM_MAX_SIZE=2048
diff --git a/machine/nxp/nxp_ls1043ardb/kernel/dts-ls1043ardb-add-TLV-hw-info-partition.patch b/machine/nxp/nxp_ls1043ardb/kernel/dts-ls1043ardb-add-TLV-hw-info-partition.patch
new file mode 100644
index 00000000..d227e4f6
--- /dev/null
+++ b/machine/nxp/nxp_ls1043ardb/kernel/dts-ls1043ardb-add-TLV-hw-info-partition.patch
@@ -0,0 +1,83 @@
+From 8e5da4592ec61569e12667276a4b27c177c942c7 Mon Sep 17 00:00:00 2001
+From: Ed Swarthout <[email protected]>
+Date: Sat, 7 Jul 2018 23:32:12 -0500
+Subject: [PATCH] dts ls1043ardb: add TLV hw-info partition
+
+and add other firmware partitions
+
+Signed-off-by: Ed Swarthout <[email protected]>
+---
+ arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 50 +++++++++++++++++++++--
+ 1 file changed, 47 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
+index eef8050..939f056 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
++++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts
+@@ -129,16 +129,60 @@
+ 			};
+ 
+ 			partition@3 {
+-				/* FMAN firmware */
+-				reg = <0x009000000 0x00040000>;
+-				label = "fman";
++				/* ppa */
++				reg = <0x00400000 0x00200000>;
++				label = "ppa";
+ 			};
+ 
+ 			partition@4 {
++				reg = <0x00600000 0x00300000>;
++				label = "secure-boot-headers";
++			};
++
++			partition@5 {
++				/* FMAN firmware*/
++				reg = <0x00900000 0x00040000>;
++				label = "fman";
++			};
++
++			partition@6 {
++				reg = <0x00940000 0x00040000>;
++				label = "qe";
++			};
++
++			partition@7 {
++				reg = <0x00980000 0x00040000>;
++				label = "free@9800000";
++			};
++
++			partition@8 {
++				/* ONIE TlvInfo configuration */
++				reg = <0x009c0000 0x00040000>;
++				label = "reserved@9c0000";
++			};
++
++			partition@9 {
++				reg = <0x00a00000 0x00500000>;
++				label = "free@a00000";
++			};
++
++			partition@10 {
++				/* Device tree (for UEFI) */
++				reg = <0x00f00000 0x00100000>;
++				label = "device-tree";
++			};
++			partition@11 {
+ 				/* ONIE image */
+ 				reg = <0x01000000 0x01000000>;
+ 				label = "onie";
+ 			};
++
++			partition@12 {
++				/* ONIE TLV HW info */
++				reg = <0x03fc0000 0x00040000>;
++				label = "hw-info";
++			};
++
+ 		};
+ 
+ 		nand@1,0 {
+-- 
+2.7.4
+
diff --git a/machine/nxp/nxp_ls1043ardb/kernel/series b/machine/nxp/nxp_ls1043ardb/kernel/series
index 5b1b5b6b..7aa9d134 100644
--- a/machine/nxp/nxp_ls1043ardb/kernel/series
+++ b/machine/nxp/nxp_ls1043ardb/kernel/series
@@ -32,3 +32,4 @@
 0032-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
 0033-staging-fsl-dpaa2-mac-backport-use-of-4.9-ndo_get_st.patch
 dts-ls1043ardb-add-ONIE-support.patch
+dts-ls1043ardb-add-TLV-hw-info-partition.patch
diff --git a/machine/nxp/nxp_ls1046ardb/busybox/conf/config b/machine/nxp/nxp_ls1046ardb/busybox/conf/config
index 0e82ba19..5ec59e6b 100644
--- a/machine/nxp/nxp_ls1046ardb/busybox/conf/config
+++ b/machine/nxp/nxp_ls1046ardb/busybox/conf/config
@@ -1,6 +1,6 @@
 CONFIG_SYS_EEPROM=y
 CONFIG_SYS_EEPROM_DEVICE_MTD=y
-CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-board_eeprom"
+CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-hw-info"
 CONFIG_SYS_EEPROM_OFFSET=0
 CONFIG_SYS_EEPROM_SIZE=2048
 CONFIG_SYS_EEPROM_MAX_SIZE=2048
diff --git a/machine/nxp/nxp_ls1046ardb/kernel/dts-ls1046ardb-add-TLV-hw-info-partition.patch b/machine/nxp/nxp_ls1046ardb/kernel/dts-ls1046ardb-add-TLV-hw-info-partition.patch
new file mode 100644
index 00000000..c7740424
--- /dev/null
+++ b/machine/nxp/nxp_ls1046ardb/kernel/dts-ls1046ardb-add-TLV-hw-info-partition.patch
@@ -0,0 +1,80 @@
+From e6c48ae4f4d217ced1aefb04e3b45a187ae35a1e Mon Sep 17 00:00:00 2001
+From: Ed Swarthout <[email protected]>
+Date: Sat, 7 Jul 2018 19:44:32 -0500
+Subject: [PATCH] dts ls1046ardb: add TLV hw-info partition
+
+and add other firmware partitions
+
+Signed-off-by: Ed Swarthout <[email protected]>
+---
+ arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 45 ++++++++++++++++++++++-
+ 1 file changed, 44 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+index 8c9de9e..96d1d3c 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
++++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts
+@@ -167,16 +167,59 @@
+ 		};
+ 
+ 		partition@3 {
++			/* ppa */
++			reg = <0x00400000 0x00200000>;
++			label = "ppa";
++		};
++
++		partition@4 {
++			reg = <0x00600000 0x00300000>;
++			label = "secure-boot-headers";
++		};
++
++		partition@5 {
+ 			/* FMAN firmware*/
+ 			reg = <0x00900000 0x00040000>;
+ 			label = "fman";
+ 		};
+ 
+-		partition@4 {
++		partition@6 {
++			reg = <0x00940000 0x00040000>;
++			label = "qe";
++		};
++
++		partition@7 {
++			reg = <0x00980000 0x00040000>;
++			label = "free@9800000";
++		};
++
++		partition@8 {
++			reg = <0x009c0000 0x00040000>;
++			label = "reserved@9c0000";
++		};
++
++		partition@9 {
++			reg = <0x00a00000 0x00500000>;
++			label = "free@a00000";
++		};
++
++		partition@10 {
++			/* Device tree (for UEFI) */
++			reg = <0x00f00000 0x00100000>;
++			label = "device-tree";
++		};
++
++		partition@11 {
+ 			/* ONIE image */
+ 			reg = <0x01000000 0x01000000>;
+ 			label = "onie";
+ 		};
++
++		partition@12 {
++			/* ONIE TLV HW info */
++			reg = <0x03fc0000 0x00040000>;
++			label = "hw-info";
++		};
+ 	};
+ 
+ 	qflash1: s25fs512s@1 {
+-- 
+2.7.4
+
diff --git a/machine/nxp/nxp_ls1046ardb/kernel/series b/machine/nxp/nxp_ls1046ardb/kernel/series
index 3835721f..73885715 100644
--- a/machine/nxp/nxp_ls1046ardb/kernel/series
+++ b/machine/nxp/nxp_ls1046ardb/kernel/series
@@ -32,3 +32,4 @@
 0032-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
 0033-staging-fsl-dpaa2-mac-backport-use-of-4.9-ndo_get_st.patch
 dts-ls1046ardb-add-ONIE-support.patch
+dts-ls1046ardb-add-TLV-hw-info-partition.patch
diff --git a/machine/nxp/nxp_ls1088ardb/busybox/conf/config b/machine/nxp/nxp_ls1088ardb/busybox/conf/config
index 0e82ba19..5ec59e6b 100644
--- a/machine/nxp/nxp_ls1088ardb/busybox/conf/config
+++ b/machine/nxp/nxp_ls1088ardb/busybox/conf/config
@@ -1,6 +1,6 @@
 CONFIG_SYS_EEPROM=y
 CONFIG_SYS_EEPROM_DEVICE_MTD=y
-CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-board_eeprom"
+CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-hw-info"
 CONFIG_SYS_EEPROM_OFFSET=0
 CONFIG_SYS_EEPROM_SIZE=2048
 CONFIG_SYS_EEPROM_MAX_SIZE=2048
diff --git a/machine/nxp/nxp_ls1088ardb/kernel/dts-ls1088ardb-add-TLV-hw-info-partition.patch b/machine/nxp/nxp_ls1088ardb/kernel/dts-ls1088ardb-add-TLV-hw-info-partition.patch
new file mode 100644
index 00000000..583023df
--- /dev/null
+++ b/machine/nxp/nxp_ls1088ardb/kernel/dts-ls1088ardb-add-TLV-hw-info-partition.patch
@@ -0,0 +1,94 @@
+From 979585cb4fe12fd9625d708a0a8d1a496ee66342 Mon Sep 17 00:00:00 2001
+From: Ed Swarthout <[email protected]>
+Date: Sat, 7 Jul 2018 02:09:02 -0500
+Subject: [PATCH] dts ls1088ardb: add TLV hw-info partition
+
+fix partition 3 address and add other firmware partitions
+
+Signed-off-by: Ed Swarthout <[email protected]>
+---
+ arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 61 +++++++++++++++++++++--
+ 1 file changed, 58 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
+index 52bb3ed..87a9588 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
++++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts
+@@ -124,16 +124,71 @@
+ 		};
+ 
+ 		partition@3 {
+-			/* MC firmware + DPL + DPC */
+-			reg = <0x00a000000 0x00500000>;
+-			label = "mc";
++			/* ppa */
++			reg = <0x00400000 0x00200000>;
++			label = "ppa";
+ 		};
+ 
+ 		partition@4 {
++			reg = <0x00600000 0x00300000>;
++			label = "secure-boot-headers";
++		};
++
++		partition@5 {
++			reg = <0x00900000 0x00040000>;
++			label = "fman";
++		};
++
++		partition@6 {
++			reg = <0x00940000 0x00040000>;
++			label = "qe";
++		};
++
++		partition@7 {
++			reg = <0x00980000 0x00040000>;
++			label = "phy-firmware";
++		};
++
++		partition@8 {
++			reg = <0x009c0000 0x00040000>;
++			label = "reserved@9c0000";
++		};
++
++		partition@9 {
++			/* MC firmware */
++			reg = <0x00a00000 0x00300000>;
++			label = "mc";
++		};
++
++		partition@10 {
++			/* DPAA2 DPL */
++			reg = <0x00d00000 0x00100000>;
++			label = "dpl";
++		};
++
++		partition@11 {
++			/* DPAA2 DPC */
++			reg = <0x00e00000 0x00100000>;
++			label = "dpc";
++		};
++
++		partition@12 {
++			/* Device tree (for UEFI) */
++			reg = <0x00f00000 0x00100000>;
++			label = "device-tree";
++		};
++
++		partition@13 {
+ 			/* ONIE image */
+ 			reg = <0x01000000 0x01000000>;
+ 			label = "onie";
+ 		};
++
++		partition@14 {
++			/* ONIE TLV HW info */
++			reg = <0x03fc0000 0x00040000>;
++			label = "hw-info";
++		};
+ 	};
+ 
+ 	qflash1: s25fs512s@1 {
+-- 
+2.7.4
+
diff --git a/machine/nxp/nxp_ls1088ardb/kernel/series b/machine/nxp/nxp_ls1088ardb/kernel/series
index 2a17406a..9953835f 100644
--- a/machine/nxp/nxp_ls1088ardb/kernel/series
+++ b/machine/nxp/nxp_ls1088ardb/kernel/series
@@ -32,3 +32,4 @@
 0032-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
 0033-staging-fsl-dpaa2-mac-backport-use-of-4.9-ndo_get_st.patch
 Platform-LS1088ardb-add-ONIE-support.patch
+dts-ls1088ardb-add-TLV-hw-info-partition.patch
diff --git a/machine/nxp/nxp_ls2088ardb/busybox/conf/config b/machine/nxp/nxp_ls2088ardb/busybox/conf/config
index 0e82ba19..5ec59e6b 100644
--- a/machine/nxp/nxp_ls2088ardb/busybox/conf/config
+++ b/machine/nxp/nxp_ls2088ardb/busybox/conf/config
@@ -1,6 +1,6 @@
 CONFIG_SYS_EEPROM=y
 CONFIG_SYS_EEPROM_DEVICE_MTD=y
-CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-board_eeprom"
+CONFIG_SYS_EEPROM_MTD_DEVICE="/dev/mtd-hw-info"
 CONFIG_SYS_EEPROM_OFFSET=0
 CONFIG_SYS_EEPROM_SIZE=2048
 CONFIG_SYS_EEPROM_MAX_SIZE=2048
diff --git a/machine/nxp/nxp_ls2088ardb/kernel/dts-ls208xardb-add-TLV-hw-info-partition.patch b/machine/nxp/nxp_ls2088ardb/kernel/dts-ls208xardb-add-TLV-hw-info-partition.patch
new file mode 100644
index 00000000..e233864a
--- /dev/null
+++ b/machine/nxp/nxp_ls2088ardb/kernel/dts-ls208xardb-add-TLV-hw-info-partition.patch
@@ -0,0 +1,94 @@
+From 9da70a39f8835183f9edfd65186930204cbf1b31 Mon Sep 17 00:00:00 2001
+From: Ed Swarthout <[email protected]>
+Date: Sat, 7 Jul 2018 12:22:35 -0500
+Subject: [PATCH] dts ls208xardb: add TLV hw-info partition
+
+fix partition 3 address and add other firmware partitions
+
+Signed-off-by: Ed Swarthout <[email protected]>
+---
+ arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 61 ++++++++++++++++++++--
+ 1 file changed, 58 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
+index 6b4569a..a6c1789 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
++++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi
+@@ -85,16 +85,71 @@
+ 		};
+ 
+ 		partition@3 {
+-			/* MC firmware + DPL + DPC */
+-			reg = <0x00a000000 0x00500000>;
+-			label = "mc";
++			/* ppa */
++			reg = <0x00400000 0x00200000>;
++			label = "ppa";
+ 		};
+ 
+ 		partition@4 {
++			reg = <0x00600000 0x00300000>;
++			label = "secure-boot-headers";
++		};
++
++		partition@5 {
++			reg = <0x00900000 0x00040000>;
++			label = "fman";
++		};
++
++		partition@6 {
++			reg = <0x00940000 0x00040000>;
++			label = "qe";
++		};
++
++		partition@7 {
++			reg = <0x00980000 0x00040000>;
++			label = "phy-firmware";
++		};
++
++		partition@8 {
++			reg = <0x009c0000 0x00040000>;
++			label = "reserved@9c0000";
++		};
++
++		partition@9 {
++			/* MC firmware */
++			reg = <0x00a00000 0x00300000>;
++			label = "mc";
++		};
++
++		partition@10 {
++			/* DPAA2 DPL */
++			reg = <0x00d00000 0x00100000>;
++			label = "dpl";
++		};
++
++		partition@11 {
++			/* DPAA2 DPC */
++			reg = <0x00e00000 0x00100000>;
++			label = "dpc";
++		};
++
++		partition@12 {
++			/* Device tree (for UEFI) */
++			reg = <0x00f00000 0x00100000>;
++			label = "device-tree";
++		};
++
++		partition@13 {
+ 			/* ONIE image */
+ 			reg = <0x01000000 0x01000000>;
+ 			label = "onie";
+ 		};
++
++		partition@14 {
++			/* ONIE TLV HW info */
++			reg = <0x03fc0000 0x00040000>;
++			label = "hw-info";
++		};
+ 	};
+ 
+ 	nand@2,0 {
+-- 
+2.7.4
+
diff --git a/machine/nxp/nxp_ls2088ardb/kernel/series b/machine/nxp/nxp_ls2088ardb/kernel/series
index 3e7d406b..dd2f166f 100644
--- a/machine/nxp/nxp_ls2088ardb/kernel/series
+++ b/machine/nxp/nxp_ls2088ardb/kernel/series
@@ -32,3 +32,4 @@
 0032-spi-nor-Add-support-for-S3AN-spi-nor-devices.patch
 0033-staging-fsl-dpaa2-mac-backport-use-of-4.9-ndo_get_st.patch
 dts-LS2088ardb-add-ONIE-support.patch
+dts-ls208xardb-add-TLV-hw-info-partition.patch