u-boot: drop fw_env.config

Currently we have downstream/upstream Toradex uboot recipes and we dont
want to add fw_env.config for both of them to avoid code redundant.

Let's move fw_env.config to libubootenv, which will be installed for
both donwstream/upstream distros.

Related-to: ELB-4536

Signed-off-by: Ming Liu <ming.liu@toradex.com>

6 files changed, 2 insertions, 57 deletions

diff --git a/recipes-bsp/u-boot/files/colibri-imx6ull/fw_env.config b/recipes-bsp/u-boot/files/colibri-imx6ull/fw_env.config
deleted file mode 100644
index 930bcee..0000000
--- a/recipes-bsp/u-boot/files/colibri-imx6ull/fw_env.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration file for fw_(printenv/setenv) utility.
-# Up to two entries are valid, in this case the redundant
-# environment sector is assumed present.
-# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash.
-# Futhermore, if the Flash sector size is ommitted, this value is assumed to
-# be the same as the Environment size, which is valid for NOR and SPI-dataflash
-
-# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
-# Colibri iMX6ULL
-/dev/mtd3		0x00000000	0x00020000	0x20000			4
diff --git a/recipes-bsp/u-boot/files/colibri-imx7/fw_env.config b/recipes-bsp/u-boot/files/colibri-imx7/fw_env.config
deleted file mode 100644
index b59116d..0000000
--- a/recipes-bsp/u-boot/files/colibri-imx7/fw_env.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration file for fw_(printenv/setenv) utility.
-# Up to two entries are valid, in this case the redundant
-# environment sector is assumed present.
-# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash.
-# Futhermore, if the Flash sector size is ommitted, this value is assumed to
-# be the same as the Environment size, which is valid for NOR and SPI-dataflash
-
-# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
-# Colibri iMX7
-/dev/mtd3		0x00000000	0x00020000	0x20000			4
diff --git a/recipes-bsp/u-boot/files/fw_env.config b/recipes-bsp/u-boot/files/fw_env.config
deleted file mode 100644
index 9f78e4c..0000000
--- a/recipes-bsp/u-boot/files/fw_env.config
+++ /dev/null
@@ -1,19 +0,0 @@
-# Configuration file for fw_(printenv/setenv) utility.
-# Up to two entries are valid, in this case the redundant
-# environment sector is assumed present.
-# Device offset must be prefixed with 0x to be parsed as a hexadecimal value.
-# On a block device a negative offset is treated as a backwards offset from the
-# end of the device/partition, rather than a forwards offset from the start.
-
-# Toradex modules with eMMC
-# The U-Boot environment is stored at the end of the first eMMC boot partition
-# hence use a negative value. The environment is just in front of the config
-# block which occupies the last sector (hence -0x200)
-# Note that the eMMC boot areas (e.g. /dev/mmcblk0boot0) by default is read
-# only. To make it writeable, execute on the cmdline e.g.
-# $ echo 0 > /sys/block/mmcblk0boot0/force_ro
-# The fw_setenv tool provided by libubootenv does this automatically.
-
-# Block device name	Device offset	Env. size
-/dev/emmc-boot0		-0x2200		0x2000
-
diff --git a/recipes-bsp/u-boot/files/vf/fw_env.config b/recipes-bsp/u-boot/files/vf/fw_env.config
deleted file mode 100644
index 51f09d1..0000000
--- a/recipes-bsp/u-boot/files/vf/fw_env.config
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration file for fw_(printenv/setenv) utility.
-# Up to two entries are valid, in this case the redundant
-# environment sector is assumed present.
-# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash.
-# Futhermore, if the Flash sector size is ommitted, this value is assumed to
-# be the same as the Environment size, which is valid for NOR and SPI-dataflash
-
-# MTD device name	Device offset	Env. size	Flash sector size	Number of sectors
-# Colibri VF61
-/dev/mtd2		0x00000000	0x00020000	0x20000			4
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common.inc b/recipes-bsp/u-boot/u-boot-toradex-common.inc
index 5717d8d..8562341 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common.inc
@@ -16,10 +16,7 @@ SRCREV = "1cbeecee44a868f4ace933a992e730efb6d9d654"
 SRCBRANCH = "toradex_2020.07"
 SRCREV:use-head-next = "${AUTOREV}"
 
-SRC_URI = " \
-    git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH} \
-    file://fw_env.config \
-"
+SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc
index a90e5c5..2919f14 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common_2022.04.inc
@@ -5,10 +5,7 @@ DEPENDS += "flex-native bison-native"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = " \
-    git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH} \
-    file://fw_env.config \
-"
+SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH}"
 
 SRCREV = "1c881f4da83cc05bee50f352fa183263d7e2622b"
 SRCREV:use-head-next = "${AUTOREV}"