Verified Commit 506dc79d authored by Karel Koci's avatar Karel Koci 🤘
Browse files

Merge branch 'hotfix/mox-uboot-env' into hbl

parents f545829d b1d63551
Pipeline #79221 passed with stages
in 15 minutes and 51 seconds
From 58f1ff52079f5e645655085ed834ead9522d8ec5 Mon Sep 17 00:00:00 2001
From 9d1d076ee0aca3d33bce5f9e5a67c804cfd03d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
Date: Wed, 22 Apr 2020 13:50:50 +0200
Subject: [PATCH] mvebu: Basic MoX support
......@@ -226,14 +226,14 @@ Signed-off-by: Marek Behún <marek.behun@nic.cz>
create mode 100644 target/linux/mvebu/patches-4.14/90125-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch
diff --git a/package/boot/uboot-tools/files/mvebu b/package/boot/uboot-tools/files/mvebu
index 89fef9e..4b9ea88 100644
index 03c8b39..8e09c18 100644
--- a/package/boot/uboot-tools/files/mvebu
+++ b/package/boot/uboot-tools/files/mvebu
@@ -21,6 +21,9 @@ cznic,turris-omnia)
ubootenv_add_uci_config "/dev/mtd0" "0xf0000" "0x10000" "0x10000"
fi
;;
+cznic,mox)
+cznic,turris-mox)
+ ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x00010000"
+ ;;
globalscale,espressobin|\
......@@ -338,7 +338,7 @@ index 0000000..24c0042
+
+endif
diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk
index d7014d6..03efd33 100644
index 7b3bcba..2cb0a42 100644
--- a/target/linux/mvebu/image/cortex-a53.mk
+++ b/target/linux/mvebu/image/cortex-a53.mk
@@ -32,6 +32,17 @@ define Device/globalscale_espressobin-v7-emmc
......@@ -14856,5 +14856,5 @@ index 0000000..785206a
+2.21.0
+
--
2.28.0
2.31.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment