From: Christian Lamparter <chunkeey@gmail.com>
Date: Wed, 17 Oct 2018 20:37:33 +0000 (+0200)
Subject: apm821xx: MR24: add to uboot-envtools
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=7356c4420ca88fbe8f972ef68da86f18046b1683;p=openwrt%2Fstaging%2Fjow.git

apm821xx: MR24: add to uboot-envtools

This patch adds the complicated u-boot
environment access settings for to the
MR24 target.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
(backported from f6968952df36bb21addabe183def2368919b66ab)
---

diff --git a/package/boot/uboot-envtools/files/apm821xx b/package/boot/uboot-envtools/files/apm821xx
index 3cedd8bc2d..94c0d8944a 100644
--- a/package/boot/uboot-envtools/files/apm821xx
+++ b/package/boot/uboot-envtools/files/apm821xx
@@ -10,6 +10,10 @@ touch /etc/config/ubootenv
 board=$(board_name)
 
 case "$board" in
+meraki,mr24)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000" "4"
+	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x4000" "4"
+	;;
 esac
 
 config_load ubootenv
diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index 8ccb0308d3..51947e1dc4 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -56,7 +56,30 @@
 
 			partition@0 {
 				label = "u-boot";
-				reg = <0x00000000 0x00170000>;
+				reg = <0x00000000 0x00150000>;
+				read-only;
+			};
+
+			partition@150000 {
+				/*
+				 * The u-boot environment size is one NAND
+				 * block (16KiB). u-boot allocates four NAND
+				 * blocks (64KiB) in order to have spares
+				 * around for bad block management
+				 */
+				label = "u-boot-env";
+				reg = <0x00150000 0x00010000>;
+				read-only;
+			};
+
+			partition@160000 {
+				/*
+				 * redundant u-boot environment.
+				 * has to be kept it in sync with the
+				 * data in "u-boot-env".
+				 */
+				label = "u-boot-env-redundant";
+				reg = <0x00160000 0x00010000>;
 				read-only;
 			};