[LEDE-DEV,v2] uboot-envtools: Add support for IPQ806x AP148 and DB149

Message ID 1498672485-26751-1-git-send-email-rjangir@codeaurora.org
State Accepted
Headers show

Commit Message

Ram Chandra Jangir June 28, 2017, 5:54 p.m.
IPQ806x AP148 and DB149 boards didn't have the UCI ubootenv
section initialized, so the usage of fw_printenv required manual
configuration. With this change, the "fw_printenv" and "fw_setenv"
command will automatically work on NOR and NAND based platforms.

Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org>
---

Changes since v1:
*Updated based on review comments.

 package/boot/uboot-envtools/files/ipq | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

Patch

diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq
index 16c7ba6..164ced0 100644
--- a/package/boot/uboot-envtools/files/ipq
+++ b/package/boot/uboot-envtools/files/ipq
@@ -13,7 +13,28 @@  touch /etc/config/ubootenv
 
 board=$(ipq806x_board_name)
 
+ubootenv_mtdinfo () {
+	UBOOTENV_PART=$(cat /proc/mtd | grep APPSBLENV)
+	mtd_dev=$(echo $UBOOTENV_PART | awk '{print $1}' | sed 's/:$//')
+	mtd_size=$(echo $UBOOTENV_PART | awk '{print "0x"$2}')
+	mtd_erase=$(echo $UBOOTENV_PART | awk '{print "0x"$3}')
+	nor_flash=$(find /sys/bus/spi/devices/*/mtd -name ${mtd_dev})
+
+	if [ -n "$nor_flash" ]; then
+		ubootenv_size=$mtd_size
+	else
+		# size is fixed to 0x40000 in u-boot
+		ubootenv_size=0x40000
+	fi
+
+	sectors=$(( $ubootenv_size / $mtd_erase ))
+	echo /dev/$mtd_dev 0x0 $ubootenv_size $mtd_erase $sectors
+}
+
 case "$board" in
+ap148 | db149)
+	ubootenv_add_uci_config $(ubootenv_mtdinfo)
+	;;
 ea8500)
 	ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000"
 	;;