Merge pull request #12 from wigyori/master

update oxnas target, update ipq806x target, create trunk tag and update revisioning accordingly

12 files changed, 4 insertions, 184 deletions

diff --git a/target/linux/ramips/mt7621/config-4.4 b/target/linux/ramips/mt7621/config-4.4
index 862c8e977e..58568c8114 100644
--- a/target/linux/ramips/mt7621/config-4.4
+++ b/target/linux/ramips/mt7621/config-4.4
@@ -218,7 +218,8 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_NR_UARTS=3
+CONFIG_SERIAL_8250_RUNTIME_UARTS=3
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SMP=y
 CONFIG_SMP_UP=y
diff --git a/target/linux/ramips/mt7621/profiles/00-default.mk b/target/linux/ramips/mt7621/profiles/00-default.mk
index fb04ba788c..24e51f4ef5 100644
--- a/target/linux/ramips/mt7621/profiles/00-default.mk
+++ b/target/linux/ramips/mt7621/profiles/00-default.mk
@@ -7,6 +7,7 @@
 
 define Profile/Default
 	NAME:=Default Profile
+	PRIORITY:=1
 	PACKAGES:=\
 		kmod-usb-core kmod-usb3 \
 		kmod-ledtrig-usbdev
diff --git a/target/linux/ramips/mt7621/profiles/firefly.mk b/target/linux/ramips/mt7621/profiles/firefly.mk
deleted file mode 100644
index 979752780b..0000000000
--- a/target/linux/ramips/mt7621/profiles/firefly.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/FIREWRT
-	NAME:=Firefly FireWRT
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 kmod-usb-hid \
-		kmod-ledtrig-usbdev
-endef
-
-define Profile/FIREWRT/Description
-	Package set compatible with the Firefly FireWRT board.
-endef
-$(eval $(call Profile,FIREWRT))
diff --git a/target/linux/ramips/mt7621/profiles/linksys.mk b/target/linux/ramips/mt7621/profiles/linksys.mk
deleted file mode 100644
index fb447c9e05..0000000000
--- a/target/linux/ramips/mt7621/profiles/linksys.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/RE6500
-	NAME:=Linksys RE6500
-endef
-
-define Profile/RE6500/Description
-	Package set compatible with the Linksys RE6500 board.
-endef
-$(eval $(call Profile,RE6500))
diff --git a/target/linux/ramips/mt7621/profiles/misc.mk b/target/linux/ramips/mt7621/profiles/misc.mk
deleted file mode 100644
index 06a9d44c88..0000000000
--- a/target/linux/ramips/mt7621/profiles/misc.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/PBR-M1
-	NAME:=PBR-M1 Device
-	FEATURES+=rtc
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 kmod-usb-hid \
-		kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci \
-		kmod-rtc-pcf8563
-endef
-
-define Profile/PBR-M1/Description
-	Default package set compatible with most boards.
-endef
-$(eval $(call Profile,PBR-M1))
diff --git a/target/linux/ramips/mt7621/profiles/mqmaker.mk b/target/linux/ramips/mt7621/profiles/mqmaker.mk
deleted file mode 100644
index 0b01ab9122..0000000000
--- a/target/linux/ramips/mt7621/profiles/mqmaker.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/WITI
-	NAME:=MQmaker WiTi
-	FEATURES+=rtc
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 kmod-usb-hid \
-		kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci \
-		kmod-rtc-pcf8563 kmod-i2c-mt7621
-endef
-
-define Profile/WITI/Description
-	Package set compatible with MQmaker WiTi board.
-endef
-$(eval $(call Profile,WITI))
diff --git a/target/linux/ramips/mt7621/profiles/netgear.mk b/target/linux/ramips/mt7621/profiles/netgear.mk
deleted file mode 100644
index 05802a252f..0000000000
--- a/target/linux/ramips/mt7621/profiles/netgear.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/WNDR3700V5
-	NAME:=Netgear WNDR3700v5
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3
-endef
-
-define Profile/WNDR3700V5/Description
-	Package set compatible with the Netgear WNDR3700v5.
-endef
-$(eval $(call Profile,WNDR3700V5))
diff --git a/target/linux/ramips/mt7621/profiles/netis.mk b/target/linux/ramips/mt7621/profiles/netis.mk
deleted file mode 100644
index 39b524f534..0000000000
--- a/target/linux/ramips/mt7621/profiles/netis.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/WF-2881
-	NAME:=NETIS WF-2881
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 kmod-usb-hid \
-		kmod-ledtrig-usbdev
-endef
-
-define Profile/WF-2881/Description
-	Package set compatible with the NETIS WF-2881 board.
-endef
-
-#-m <min io size> -e <LEB size> -c <Eraseblocks count>
-WF-2881_UBIFS_OPTS:="-m 2048 -e 129024 -c 1024"
-WF-2881_UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-
-$(eval $(call Profile,WF-2881))
diff --git a/target/linux/ramips/mt7621/profiles/storylink.mk b/target/linux/ramips/mt7621/profiles/storylink.mk
deleted file mode 100644
index 9ca4a2f743..0000000000
--- a/target/linux/ramips/mt7621/profiles/storylink.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/SAP-G3200U3
-	NAME:=STORYLiNK SAP-G3200U3
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 kmod-usb-hid \
-		kmod-ledtrig-usbdev
-endef
-
-define Profile/SAP-G3200U3/Description
-	Package set compatible with the STORYLiNK SAP-G3200U3 board.
-endef
-$(eval $(call Profile,SAP-G3200U3))
diff --git a/target/linux/ramips/mt7621/profiles/ubnt.mk b/target/linux/ramips/mt7621/profiles/ubnt.mk
deleted file mode 100644
index 3f1af02c57..0000000000
--- a/target/linux/ramips/mt7621/profiles/ubnt.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/UBNT-ERX
-	NAME:=Ubiquiti EdgeRouter X
-	FEATURES+=nand -usb
-	PACKAGES:=-kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 \
-			-wpad-mini -iwinfo
-endef
-
-define Profile/UBNT-ERX/Description
-	Package set compatible with the Ubiquiti EdgeRouter X
-endef
-$(eval $(call Profile,UBNT-ERX))
diff --git a/target/linux/ramips/mt7621/profiles/zbt.mk b/target/linux/ramips/mt7621/profiles/zbt.mk
deleted file mode 100644
index 453687d4c5..0000000000
--- a/target/linux/ramips/mt7621/profiles/zbt.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/ZBT-WG2626
-	NAME:=ZBT-WG2626 Device
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 \
-		kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci
-endef
-
-define Profile/ZBT-WG2626/Description
-	Package set for ZBT-WG2626 device
-endef
-$(eval $(call Profile,ZBT-WG2626))
-
-
-define Profile/ZBT-WG3526
-	NAME:=ZBT-WG3526 Device
-	PACKAGES:=\
-		kmod-usb-core kmod-usb3 \
-		kmod-ledtrig-usbdev kmod-ata-core kmod-ata-ahci
-endef
-
-define Profile/ZBT-WG3526/Description
-	Package set for ZBT-WG3526 device
-endef
-$(eval $(call Profile,ZBT-WG3526))
diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk
index a0a7afc969..7e175435b3 100644
--- a/target/linux/ramips/mt7621/target.mk
+++ b/target/linux/ramips/mt7621/target.mk
@@ -4,11 +4,9 @@
 
 SUBTARGET:=mt7621
 BOARDNAME:=MT7621 based boards
-ARCH_PACKAGES:=ramips_1004kc
-FEATURES+=usb
+FEATURES+=usb rtc
 CPU_TYPE:=1004kc
 CPU_SUBTYPE:=dsp
-CFLAGS:=-Os -pipe -mmt -mips32r2 -mtune=1004kc
 
 DEFAULT_PACKAGES += kmod-mt76