aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-07-15 20:48:33 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-25 13:52:38 +0200
commit713be7543909b79fbbccdea297e306cb3d3adb0c (patch)
treee5e9e30aa539263a55c766734c328c0f97909d53 /package/boot
parentcbdd2b62e4d5e0572204c37d874d32dc8610840e (diff)
downloadupstream-713be7543909b79fbbccdea297e306cb3d3adb0c.tar.gz
upstream-713be7543909b79fbbccdea297e306cb3d3adb0c.tar.bz2
upstream-713be7543909b79fbbccdea297e306cb3d3adb0c.zip
uboot-envtools: mvebu: update uci defaults for Turris Omnia
From version 2021.09 U-Boot will fixup Turris Omnia's DTB before booting, separating U-Boot's environment into separate MTD partition "u-boot-env" [1]. Check if "u-boot-env" MTD partition exists and set the uci defaults accordingly. [1] https://lists.denx.de/pipermail/u-boot/2021-July/455017.html Signed-off-by: Marek BehĂșn <marek.behun@nic.cz>
Diffstat (limited to 'package/boot')
-rw-r--r--package/boot/uboot-envtools/files/mvebu5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu
index 25f29599a3..7136d5b4cd 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-envtools/files/mvebu
@@ -17,7 +17,10 @@ buffalo,ls421de)
ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000"
;;
cznic,turris-omnia)
- if grep -q 'U-Boot 2015.10-rc2' /dev/mtd0; then
+ idx="$(find_mtd_index u-boot-env)"
+ if [ -n "$idx" ]; then
+ ubootenv_add_uci_config "/dev/mtd${idx}" "0x0" "0x10000" "0x10000"
+ elif grep -q 'U-Boot 2015.10-rc2' /dev/mtd0; then
ubootenv_add_uci_config "/dev/mtd0" "0xc0000" "0x10000" "0x40000"
else
ubootenv_add_uci_config "/dev/mtd0" "0xf0000" "0x10000" "0x10000"