ipq806x: Sort occurrences of boardame alphabetically

[openwrt/openwrt.git] / package / boot / uboot-envtools / files / ipq

diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq
index 16c7ba6bb7c2036d3747b2397de73b61f2899e48..4618aac892d98bf377d3a53d81c9ca55ae702f7d 100644 (file)
--- a/package/boot/uboot-envtools/files/ipq
+++ b/package/boot/uboot-envtools/files/ipq
@@ -7,17 +7,38 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ipq806x.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ipq806x_board_name)
+board=$(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
-ea8500)
+linksys,ea8500)
        ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000"
        ;;
-nbg6817)
+qcom,ipq8064-ap148 |\
+qcom,ipq8064-db149)
+       ubootenv_add_uci_config $(ubootenv_mtdinfo)
+       ;;
+zyxel,nbg6817)
        ubootenv_add_uci_config "/dev/mtdblock9" "0x0" "0x10000" "0x10000"
        ;;
 esac