aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2018-10-17 22:37:33 +0200
committerJohn Crispin <john@phrozen.org>2018-11-26 12:05:46 +0100
commitf6968952df36bb21addabe183def2368919b66ab (patch)
treebfff2e9b4501718da782630955c5539f16843cf1
parent6f4f77aa1d8c4c9a0996147196310c4f29f793e3 (diff)
downloadupstream-f6968952df36bb21addabe183def2368919b66ab.tar.gz
upstream-f6968952df36bb21addabe183def2368919b66ab.tar.bz2
upstream-f6968952df36bb21addabe183def2368919b66ab.zip
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>
-rw-r--r--package/boot/uboot-envtools/files/apm821xx4
-rw-r--r--target/linux/apm821xx/dts/meraki-mr24.dts25
2 files changed, 28 insertions, 1 deletions
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 fc879fe8c1..3b05d9c24e 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -55,7 +55,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;
};