diff --git a/target/linux/ipq806x/base-files/lib/preinit/06_set_iface_mac b/target/linux/ipq806x/base-files/lib/preinit/06_set_iface_mac
index 2638df1da..f0c7dda87 100644
--- a/target/linux/ipq806x/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/ipq806x/base-files/lib/preinit/06_set_iface_mac
@@ -9,6 +9,7 @@ preinit_set_mac_address() {
 	. /lib/functions.sh
 
 	case $(board_name) in
+	asus,rt-ac58u|\
 	asus,rt-acrh17)
 		CI_UBIPART=UBI_DEV
 		mac=$(mtd_get_mac_binary_ubi Factory 4102)
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index 295177c95..571c9cc8a 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -5,34 +5,12 @@ RAMFS_COPY_BIN='fw_printenv fw_setenv'
 RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
 
 platform_check_image() {
-	local board=$(board_name)
-
-	case "$board" in
-	rt-ac58u)
-		CI_UBIPART="UBI_DEV"
-		local ubidev=$(nand_find_ubi $CI_UBIPART)
-		local asus_root=$(nand_find_volume $ubidev jffs2)
-
-		[ -n "$asus_root" ] || return 0
-
-		cat << EOF
-jffs2 partition is still present.
-There's probably no space left
-to install the filesystem.
-
-You need to delete the jffs2 partition first:
-# ubirmvol /dev/ubi0 --name=jffs2
-
-Once this is done. Retry.
-EOF
-		return 1
-		;;
-	esac
-	return 0
+	return 0;
 }
 
 platform_do_upgrade() {
 	case "$(board_name)" in
+	asus,rt-ac58u|\
 	asus,rt-acrh17)
 		CI_UBIPART="UBI_DEV"
 		CI_KERNPART="linux"
@@ -44,11 +22,6 @@ platform_do_upgrade() {
 		[ -n "$linux2" ] && ubirmvol /dev/$ubidev --name=linux2
 		nand_do_upgrade "$1"
 		;;
-	asus,rt-ac58u)
-		CI_UBIPART="UBI_DEV"
-		CI_KERNPART="linux"
-		nand_do_upgrade "$1"
-		;;
 	linksys,ea8500)
 		platform_do_upgrade_linksys "$ARGV"
 		;;