From 98063a8eaff2e5c81fe107650c6714f7958f2289 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 18 Jun 2020 12:16:29 +0200 Subject: u-boot-toradex-fw-utils: replace soc overrides to also include use-mainline-bsp With use-mainline-bsp the SoC overrides mx6/mx6q/mx6ull... are filtered out of the overrides. Replace them with the specific machine name. Related-to: ELB-2805 Signed-off-by: Max Krummenacher (cherry picked from commit 5b0bdea54a34e872a707a3e35d97a157f4c00240) --- recipes-bsp/u-boot/files/colibri-imx6/fw_env.config | 17 +++++++++++++++++ recipes-bsp/u-boot/files/mx6/fw_env.config | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 recipes-bsp/u-boot/files/colibri-imx6/fw_env.config delete mode 100644 recipes-bsp/u-boot/files/mx6/fw_env.config (limited to 'recipes-bsp') diff --git a/recipes-bsp/u-boot/files/colibri-imx6/fw_env.config b/recipes-bsp/u-boot/files/colibri-imx6/fw_env.config new file mode 100644 index 0000000..a9e724e --- /dev/null +++ b/recipes-bsp/u-boot/files/colibri-imx6/fw_env.config @@ -0,0 +1,17 @@ +# 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. + +# Colibri iMX6/Apalis iMX6 +# 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 /dev/mmcblk0boot0 by default is read only +# To use fw_setenv you have to first make it writeable, on the cmdline e.g. by +# $ echo 0 > /sys/block/mmcblk0boot0/force_ro + +# Block device name Device offset Env. size +/dev/mmcblk0boot0 -0x2200 0x2000 diff --git a/recipes-bsp/u-boot/files/mx6/fw_env.config b/recipes-bsp/u-boot/files/mx6/fw_env.config deleted file mode 100644 index a9e724e..0000000 --- a/recipes-bsp/u-boot/files/mx6/fw_env.config +++ /dev/null @@ -1,17 +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. - -# Colibri iMX6/Apalis iMX6 -# 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 /dev/mmcblk0boot0 by default is read only -# To use fw_setenv you have to first make it writeable, on the cmdline e.g. by -# $ echo 0 > /sys/block/mmcblk0boot0/force_ro - -# Block device name Device offset Env. size -/dev/mmcblk0boot0 -0x2200 0x2000 -- cgit v1.2.3