From 4d1b12642a02595209eefc74e34f160c6e2a56fd Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Tue, 8 Mar 2022 12:10:05 +0100
Subject: [PATCH] u-boot-boundary: fix fw_env.config management

- use soc-specific folders to easily differentiate mmc index difference
  in our imx8 family of products
- use mmcblk2 folder for imx8mp as the mmc index is wrong otherwise
- switch mmc env offset to negative value in order to support all eMMC
sizes (some have boot part of 2MiB, others 4MiB)

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 recipes-bsp/u-boot/u-boot-boundary/aarch64/fw_env.config      | 1 -
 .../u-boot-boundary/{arm => mx6-generic-bsp}/fw_env.config    | 0
 .../u-boot/u-boot-boundary/mx7-generic-bsp/fw_env.config      | 1 +
 .../u-boot/u-boot-boundary/mx8mm-generic-bsp/fw_env.config    | 1 +
 .../u-boot/u-boot-boundary/mx8mn-generic-bsp/fw_env.config    | 1 +
 .../u-boot/u-boot-boundary/mx8mp-generic-bsp/fw_env.config    | 1 +
 .../u-boot/u-boot-boundary/mx8mq-generic-bsp/fw_env.config    | 1 +
 recipes-bsp/u-boot/u-boot-boundary_2020.10.bb                 | 4 ----
 8 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-boundary/aarch64/fw_env.config
 rename recipes-bsp/u-boot/u-boot-boundary/{arm => mx6-generic-bsp}/fw_env.config (100%)
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary/mx7-generic-bsp/fw_env.config
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary/mx8mm-generic-bsp/fw_env.config
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary/mx8mn-generic-bsp/fw_env.config
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary/mx8mp-generic-bsp/fw_env.config
 create mode 100644 recipes-bsp/u-boot/u-boot-boundary/mx8mq-generic-bsp/fw_env.config

diff --git a/recipes-bsp/u-boot/u-boot-boundary/aarch64/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/aarch64/fw_env.config
deleted file mode 100644
index b69cec9..0000000
--- a/recipes-bsp/u-boot/u-boot-boundary/aarch64/fw_env.config
+++ /dev/null
@@ -1 +0,0 @@
-/dev/mmcblk0boot0	0x3fe000	0x2000		0x1000
diff --git a/recipes-bsp/u-boot/u-boot-boundary/arm/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/mx6-generic-bsp/fw_env.config
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-boundary/arm/fw_env.config
rename to recipes-bsp/u-boot/u-boot-boundary/mx6-generic-bsp/fw_env.config
diff --git a/recipes-bsp/u-boot/u-boot-boundary/mx7-generic-bsp/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/mx7-generic-bsp/fw_env.config
new file mode 100644
index 0000000..571e829
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary/mx7-generic-bsp/fw_env.config
@@ -0,0 +1 @@
+/dev/mtd1   0x00000 0x2000  0x1000  2
diff --git a/recipes-bsp/u-boot/u-boot-boundary/mx8mm-generic-bsp/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/mx8mm-generic-bsp/fw_env.config
new file mode 100644
index 0000000..e3f26f6
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary/mx8mm-generic-bsp/fw_env.config
@@ -0,0 +1 @@
+/dev/mmcblk0boot0	-0x2000		0x2000
diff --git a/recipes-bsp/u-boot/u-boot-boundary/mx8mn-generic-bsp/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/mx8mn-generic-bsp/fw_env.config
new file mode 100644
index 0000000..e3f26f6
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary/mx8mn-generic-bsp/fw_env.config
@@ -0,0 +1 @@
+/dev/mmcblk0boot0	-0x2000		0x2000
diff --git a/recipes-bsp/u-boot/u-boot-boundary/mx8mp-generic-bsp/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/mx8mp-generic-bsp/fw_env.config
new file mode 100644
index 0000000..7373c0e
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary/mx8mp-generic-bsp/fw_env.config
@@ -0,0 +1 @@
+/dev/mmcblk2boot0	-0x2000		0x2000
diff --git a/recipes-bsp/u-boot/u-boot-boundary/mx8mq-generic-bsp/fw_env.config b/recipes-bsp/u-boot/u-boot-boundary/mx8mq-generic-bsp/fw_env.config
new file mode 100644
index 0000000..e3f26f6
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-boundary/mx8mq-generic-bsp/fw_env.config
@@ -0,0 +1 @@
+/dev/mmcblk0boot0	-0x2000		0x2000
diff --git a/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb b/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
index 3775277..a96e5f0 100644
--- a/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
+++ b/recipes-bsp/u-boot/u-boot-boundary_2020.10.bb
@@ -1,10 +1,6 @@
 require recipes-bsp/u-boot/u-boot.inc
 require recipes-bsp/u-boot/u-boot-boundary-common_${PV}.inc
 
-FILESEXTRAPATHS:prepend:mx6-generic-bsp := "${THISDIR}/${PN}/arm:"
-FILESEXTRAPATHS:prepend:mx7-generic-bsp := "${THISDIR}/${PN}/arm:"
-FILESEXTRAPATHS:prepend:mx8-generic-bsp := "${THISDIR}/${PN}/aarch64:"
-
 DEPENDS += "bison-native"
 
 SRC_URI += "file://fw_env.config"