aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-06-26 10:14:14 +0000
committerLuka Perkov <luka@openwrt.org>2014-06-26 10:14:14 +0000
commite575c759ca607b8bff9a302fbc31def6317340bf (patch)
treee39774ca7788a6a0aed46d271065a90e3c37d4fe /package/boot
parentfa0b9bcceab5a82df39e374da01117f0688508b2 (diff)
downloadupstream-e575c759ca607b8bff9a302fbc31def6317340bf.tar.gz
upstream-e575c759ca607b8bff9a302fbc31def6317340bf.tar.bz2
upstream-e575c759ca607b8bff9a302fbc31def6317340bf.zip
uboot-envtools: use new scripts from /lib/ to match boards
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 41340
Diffstat (limited to 'package/boot')
-rw-r--r--package/boot/uboot-envtools/Makefile2
-rw-r--r--package/boot/uboot-envtools/files/imx67
-rw-r--r--package/boot/uboot-envtools/files/kirkwood11
3 files changed, 12 insertions, 8 deletions
diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index dad971a4e4..301a0e432a 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=uboot-envtools
PKG_DISTNAME:=u-boot
PKG_VERSION:=2014.04
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
diff --git a/package/boot/uboot-envtools/files/imx6 b/package/boot/uboot-envtools/files/imx6
index 66fceac841..fac6436c10 100644
--- a/package/boot/uboot-envtools/files/imx6
+++ b/package/boot/uboot-envtools/files/imx6
@@ -1,19 +1,20 @@
#!/bin/sh
#
-# Copyright (C) 2013 OpenWrt.org
+# Copyright (C) 2013-2014 OpenWrt.org
#
[ -e /etc/config/ubootenv ] && exit 0
touch /etc/config/ubootenv
+. /lib/imx6.sh
. /lib/uboot-envtools.sh
. /lib/functions.sh
-board=$(cat /proc/device-tree/model)
+board=$(imx6_board_name)
case "$board" in
-"Wandboard i.MX6 Dual Lite Board")
+"wandboard")
ubootenv_add_uci_config "/dev/mmcblk0" "0x60000" "0x2000" "0x2000"
;;
esac
diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-envtools/files/kirkwood
index 7856f3cfd4..ef6c1131a7 100644
--- a/package/boot/uboot-envtools/files/kirkwood
+++ b/package/boot/uboot-envtools/files/kirkwood
@@ -7,13 +7,16 @@
touch /etc/config/ubootenv
+. /lib/kirkwood.sh
. /lib/uboot-envtools.sh
. /lib/functions.sh
-case "`cat /proc/device-tree/model`" in
-"Cloud Engines Pogoplug E02" | \
-"Linksys EA4500" | \
-"RaidSonic ICY BOX IB-NAS62x0 (Rev B)")
+board=$(kirkwood_board_name)
+
+case "$board" in
+"ea4500" | \
+"ib62x0" | \
+"pogo_e02")
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
;;
esac