9 files changed, 9 insertions, 18 deletions
diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx
index 503e593089..5c7b16c40e 100644
--- a/package/boot/uboot-envtools/files/ar71xx
+++ b/package/boot/uboot-envtools/files/ar71xx
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ar71xx.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ar71xx_board_name)
+board=$(board_name)
 
 case "$board" in
 a40|\
diff --git a/package/boot/uboot-envtools/files/cns3xxx b/package/boot/uboot-envtools/files/cns3xxx
index a56be15c57..f998de463c 100644
--- a/package/boot/uboot-envtools/files/cns3xxx
+++ b/package/boot/uboot-envtools/files/cns3xxx
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/cns3xxx.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(cns3xxx_board_name)
+board=$(board_name)
 
 case "$board" in
 laguna)
diff --git a/package/boot/uboot-envtools/files/imx6 b/package/boot/uboot-envtools/files/imx6
index a78c4fbe53..fec8ce0aa4 100644
--- a/package/boot/uboot-envtools/files/imx6
+++ b/package/boot/uboot-envtools/files/imx6
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/imx6.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(imx6_board_name)
+board=$(board_name)
 
 case "$board" in
 *gw5*)
diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq
index 16c7ba6bb7..5d0a47790a 100644
--- a/package/boot/uboot-envtools/files/ipq
+++ b/package/boot/uboot-envtools/files/ipq
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ipq806x.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ipq806x_board_name)
+board=$(board_name)
 
 case "$board" in
 ea8500)
diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-envtools/files/kirkwood
index 26ae1b09ec..3b770c12f4 100644
--- a/package/boot/uboot-envtools/files/kirkwood
+++ b/package/boot/uboot-envtools/files/kirkwood
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/kirkwood.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(kirkwood_board_name)
+board=$(board_name)
 
 case "$board" in
 dockstar|\
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu
index 2bbbc23661..e33830e0a7 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-envtools/files/mvebu
@@ -8,11 +8,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/mvebu.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(mvebu_board_name)
+board=$(board_name)
 
 case "$board" in
 armada-385-linksys-caiman|\
diff --git a/package/boot/uboot-envtools/files/mxs b/package/boot/uboot-envtools/files/mxs
index ab8b4ef937..37d3c96ed4 100644
--- a/package/boot/uboot-envtools/files/mxs
+++ b/package/boot/uboot-envtools/files/mxs
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/mxs.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(mxs_board_name)
+board=$(board_name)
 
 case "$board" in
 duckbill)
diff --git a/package/boot/uboot-envtools/files/oxnas b/package/boot/uboot-envtools/files/oxnas
index ac4744e3e2..70b0f1663a 100644
--- a/package/boot/uboot-envtools/files/oxnas
+++ b/package/boot/uboot-envtools/files/oxnas
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/oxnas.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(oxnas_board_name)
+board=$(board_name)
 
 case "$board" in
 akitio|\
diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
index 9ce8c30edd..fa80e95299 100644
--- a/package/boot/uboot-envtools/files/ramips
+++ b/package/boot/uboot-envtools/files/ramips
@@ -7,11 +7,10 @@
 
 touch /etc/config/ubootenv
 
-. /lib/ramips.sh
 . /lib/uboot-envtools.sh
 . /lib/functions.sh
 
-board=$(ramips_board_name)
+board=$(board_name)
 
 case "$board" in
 all0239-3g|\