Merge pull request #7 from riptidewave93/staging

Update to r47244
riptidewave93 · Oct 22, 2015 · fa2a53a · fa2a53a
2 parents 0ca8a80 + 585d954
commit fa2a53a
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 146 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Bringup repo for the Cisco Meraki MR18 on OpenWRT!
 
-Code is based on revision http://git.openwrt.org/?p=openwrt.git;a=commit;h=dfa904f762846dc0e9d46119490d2466c4b95b60
+Code is based on revision http://git.openwrt.org/?p=openwrt.git;a=commit;h=19cc7583f050ea411e30b0bf203a8801e5ee45ae
 
 Building
 -----

diff --git a/build.sh b/build.sh
@@ -23,7 +23,7 @@ if [ ! -d $clonedir ]; then
   Msg "Cloning Repo..."
   git clone git://git.openwrt.org/openwrt.git $clonedir
   cd $clonedir
-  git reset --hard dfa904f762846dc0e9d46119490d2466c4b95b60
+  git reset --hard 19cc7583f050ea411e30b0bf203a8801e5ee45ae
   cd - > /dev/null
 fi
 

diff --git a/overlay/package/base-files/files/etc/rc.button/reset b/overlay/package/base-files/files/etc/rc.button/reset
diff --git a/overlay/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/overlay/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -32,7 +32,6 @@ ath9k_patch_firmware_mac() {
 
 [ -e /lib/firmware/$FIRMWARE ] && exit 0
 
-
 . /lib/ar71xx.sh
 . /lib/functions.sh
 . /lib/functions/system.sh

diff --git a/overlay/target/linux/ar71xx/base-files/lib/ar71xx.sh b/overlay/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -853,6 +853,9 @@ ar71xx_board_detect() {
 	*"UniFi AP Pro")
 		name="uap-pro"
 		;;
+	"WeIO"*)
+		name="weio"
+		;;
 	*WHR-G301N)
 		name="whr-g301n"
 		;;

diff --git a/overlay/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh b/overlay/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
@@ -49,7 +49,7 @@ merakinand_copy_caldata() {
 		}
 
 		# Dest is UBI
-		# To:Do possibly add create (hard to do when rootfs_data is expanded & mounted)
+		# TODO: possibly add create (hard to do when rootfs_data is expanded & mounted)
 		# Would need to be done from ramdisk
 		mtd_dst="$(nand_find_volume $ubidev $cal_dst)"
 		[ -n "$mtd_dst" ] || {

diff --git a/overlay/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/overlay/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -252,7 +252,8 @@ platform_check_image() {
 	nbg460n_550n_550nh | \
 	unifi | \
 	unifi-outdoor | \
-	carambola2 )
+	carambola2 | \
+	weio )
 		[ "$magic" != "2705" ] && {
 			echo "Invalid image type."
 			return 1
@@ -488,7 +489,7 @@ platform_pre_upgrade() {
 	wndr4300 )
 		nand_do_upgrade "$1"
 		;;
-	mr18 )
+	mr18)
 		merakinand_do_upgrade "$1"
 		;;
 	esac

diff --git a/overlay/target/linux/ar71xx/config-4.1 b/overlay/target/linux/ar71xx/config-4.1
@@ -144,6 +144,7 @@ CONFIG_ATH79_MACH_TL_WR941ND=y
 CONFIG_ATH79_MACH_TUBE2H=y
 CONFIG_ATH79_MACH_UBNT=y
 CONFIG_ATH79_MACH_UBNT_XM=y
+CONFIG_ATH79_MACH_WEIO=y
 CONFIG_ATH79_MACH_WHR_HP_G300N=y
 CONFIG_ATH79_MACH_WLAE_AG300N=y
 CONFIG_ATH79_MACH_WLR8100=y