Merge pull request #12 from wigyori/master

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

10 files changed, 107 insertions, 139 deletions

diff --git a/target/linux/oxnas/Makefile b/target/linux/oxnas/Makefile
index f4a01f189f..0ee349836f 100644
--- a/target/linux/oxnas/Makefile
+++ b/target/linux/oxnas/Makefile
@@ -21,8 +21,9 @@ include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += \
 	kmod-ata-core kmod-ata-oxnas-sata kmod-button-hotplug \
-	kmod-input-gpio-keys-polled kmod-leds-gpio kmod-usb2-oxnas \
-	uboot-envtools uboot-oxnas-ox820
+	kmod-input-gpio-keys-polled kmod-ledtrig-usbdev kmod-leds-gpio \
+	kmod-usb2-oxnas kmod-usb-storage uboot-envtools \
+	uboot-oxnas-ox820
 
 KERNELNAME:=zImage dtbs
 
diff --git a/target/linux/oxnas/config-4.4 b/target/linux/oxnas/config-4.4
index 07ce8b2f64..23b20de4a3 100644
--- a/target/linux/oxnas/config-4.4
+++ b/target/linux/oxnas/config-4.4
@@ -192,9 +192,6 @@ CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_ICPLUS_PHY=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_UDP_DIAG=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_MISC is not set
 CONFIG_IOMMU_API=y
@@ -286,7 +283,6 @@ CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_PACKET_DIAG=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
@@ -346,7 +342,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
-CONFIG_SOCK_DIAG=y
 CONFIG_SRCU=y
 CONFIG_STMMAC_ETH=y
 CONFIG_STMMAC_PLATFORM=y
diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile
index 27da2da27c..27e21a5cba 100644
--- a/target/linux/oxnas/image/Makefile
+++ b/target/linux/oxnas/image/Makefile
@@ -14,23 +14,31 @@ KD20_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 POGOPLUG_PRO_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096
 
-DEVICE_VARS += DEVICE_DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
+DEVICE_VARS += DTS KERNEL_SIZE PAGESIZE BLOCKSIZE SUBPAGESIZE
 DEVICE_VARS += KERNEL_IN_UBI UBOOTENV_IN_UBI UBIFS_OPTS
 
 KERNEL_LOADADDR := 0x60008000
-TARGET_DEVICES = akitio kd20 pogoplug-pro pogoplug-v3 stg212
+
+define Build/ubootable
+	(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
+	 dd if="$@" bs=128k conv=sync ) >> $@.new
+	@mv "$@.new" "$@"
+endef
 
 define Device/Default
-  KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
-  KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb
+  KERNEL_DEPENDS = $$(wildcard $$(DTS_DIR)/ox820-$$(DTS).dts)
+  KERNEL = kernel-bin | lzma | fit lzma $$(DTS_DIR)/ox820-$$(DTS).dtb
   KERNEL_NAME := zImage
-  KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb | ubootable
+  KERNEL_SUFFIX := -uImage
+  KERNEL_INSTALL := 1
+  KERNEL_INITRAMFS = kernel-bin | lzma | fit lzma $$(DTS_DIR)/ox820-$$(DTS).dtb | ubootable
   KERNEL_INITRAMFS_PREFIX = $$(IMAGE_PREFIX)-u-boot-initramfs
+  KERNEL_INITRAMFS_SUFFIX := .bin
   BLOCKSIZE := 128KiB
   PAGESIZE := 2048
   SUBPAGESIZE := 512
   FILESYSTEMS := squashfs ubifs
-  PROFILES := Default
+  PROFILES = Default $$(DTS)
   IMAGES := ubinized.bin sysupgrade.tar
   IMAGE/ubinized.bin := append-ubi
   IMAGE/sysupgrade.tar := sysupgrade-nand
@@ -39,52 +47,39 @@ define Device/Default
 endef
 
 define Device/akitio
-  PROFILES := Default AKITIO
-  DEVICE_DTS := ox820-akitio
+  DTS := akitio
+  DEVICE_TITLE := Akitio MyCloud mini / Silverstone DC01
+  DEVICE_PACKAGES := kmod-i2c-gpio kmod-rtc-ds1307
 endef
+TARGET_DEVICES += akitio
 
 define Device/kd20
-  PROFILES := Default KD20
-  DEVICE_DTS := ox820-kd20
+  DTS := kd20
+  DEVICE_TITLE := Shuttle KD20
+  DEVICE_PACKAGES := kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \
+                     kmod-hwmon-core kmod-hwmon-gpiofan
 endef
+TARGET_DEVICES += kd20
 
 define Device/pogoplug-pro
-  PROFILES := Default POGOPLUG_PRO
-  DEVICE_DTS := ox820-pogoplug-pro
+  DTS := pogoplug-pro
+  DEVICE_TITLE := Cloud Engines Pogoplug Pro (with mPCIe)
 endef
+TARGET_DEVICES += pogoplug-pro
 
 define Device/pogoplug-v3
-  PROFILES := Default POGOPLUG_V3
-  DEVICE_DTS := ox820-pogoplug-v3
+  DTS := pogoplug-v3
+  DEVICE_TITLE := Cloud Engines Pogoplug V3 (no mPCIe)
 endef
+TARGET_DEVICES += pogoplug-v3
 
 define Device/stg212
-  PROFILES := Default STG212
-  DEVICE_DTS := ox820-stg212
+  DTS := stg212
+  DEVICE_TITLE := MitraStar STG-212
 endef
+TARGET_DEVICES += stg212
 
 VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 
-define Build/ubootable
-	(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \
-	 dd if="$@" bs=128k conv=sync ) >> $@.new
-	@mv "$@.new" "$@"
-endef
-
-define Image/BuildKernel
-	$(call Image/BuildKernel/Template/$(PROFILE))
-endef
-
-define Image/InstallKernel
-	$(call Image/InstallKernel/Template/$(PROFILE))
-endef
-
-define Image/Build
-	$(if $(Image/Build/$(1)), \
-		$(call Image/Build/$(1),$(1)), \
-		$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-$(1).img \
-	)
-endef
-
 $(eval $(call BuildImage))
diff --git a/target/linux/oxnas/modules.mk b/target/linux/oxnas/modules.mk
new file mode 100644
index 0000000000..7016398619
--- /dev/null
+++ b/target/linux/oxnas/modules.mk
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2016 LEDE project
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define KernelPackage/ata-oxnas-sata
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=oxnas Serial ATA support
+  KCONFIG:=CONFIG_SATA_OXNAS
+  DEPENDS:=@TARGET_oxnas
+  FILES:=$(LINUX_DIR)/drivers/ata/sata_oxnas.ko
+  AUTOLOAD:=$(call AutoLoad,41,sata_oxnas,1)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-oxnas-sata/description
+ SATA support for OX934 core found in the OX82x/PLX782x SoCs
+endef
+
+$(eval $(call KernelPackage,ata-oxnas-sata))
+
+
+define KernelPackage/usb2-oxnas
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=OXNAS USB controller driver
+  DEPENDS:=@TARGET_oxnas +kmod-usb2
+  KCONFIG:=CONFIG_USB_EHCI_OXNAS
+  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-oxnas.ko
+  AUTOLOAD:=$(call AutoLoad,55,ehci-oxnas,1)
+  $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-oxnas/description
+ This driver provides USB Device Controller support for the
+ EHCI USB host built-in to the PLXTECH NAS782x SoC
+endef
+
+$(eval $(call KernelPackage,usb2-oxnas))
diff --git a/target/linux/oxnas/patches-4.4/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-4.4/010-arm_introduce-dma-fiq-irq-broadcast.patch
index b59c06e2ab..024675e599 100644
--- a/target/linux/oxnas/patches-4.4/010-arm_introduce-dma-fiq-irq-broadcast.patch
+++ b/target/linux/oxnas/patches-4.4/010-arm_introduce-dma-fiq-irq-broadcast.patch
@@ -4,15 +4,17 @@
  #define __cpuc_flush_user_range		__glue(_CACHE,_flush_user_cache_range)
  #define __cpuc_coherent_kern_range	__glue(_CACHE,_coherent_kern_range)
  #define __cpuc_coherent_user_range	__glue(_CACHE,_coherent_user_range)
-+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
- #define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)
+-#define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)
  
- #define dmac_flush_range		__glue(_CACHE,_dma_flush_range)
+-#define dmac_flush_range		__glue(_CACHE,_dma_flush_range)
++#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
++# define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)
++# define dmac_flush_range		__glue(_CACHE,_dma_flush_range)
 +#else
-+#define __cpuc_flush_dcache_area	__glue(fiq,_flush_kern_dcache_area)
++# define __cpuc_flush_dcache_area	__glue(fiq,_flush_kern_dcache_area)
++# define dmac_flush_range		__glue(fiq,_dma_flush_range)
++#endif
 +
-+#define dmac_flush_range		__glue(fiq,_dma_flush_range)
-+#endif /* CONFIG_DMA_CACHE_FIQ_BROADCAST */
  #endif
  
  #endif
@@ -38,15 +40,23 @@
  
 --- a/arch/arm/mm/flush.c
 +++ b/arch/arm/mm/flush.c
-@@ -329,7 +329,11 @@ void flush_dcache_page(struct page *page
+@@ -319,6 +319,7 @@ void __sync_icache_dcache(pte_t pteval)
+ void flush_dcache_page(struct page *page)
+ {
+ 	struct address_space *mapping;
++	bool skip_broadcast = true;
+ 
+ 	/*
+ 	 * The zero page is never written to, so never has any dirty
+@@ -329,7 +330,10 @@ void flush_dcache_page(struct page *page
  
  	mapping = page_mapping(page);
  
+-	if (!cache_ops_need_broadcast() &&
 +#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
- 	if (!cache_ops_need_broadcast() &&
-+#else
-+	if (
++	skip_broadcast = !cache_ops_need_broadcast();
 +#endif
++	if (skip_broadcast &&
  	    mapping && !page_mapped(page))
  		clear_bit(PG_dcache_clean, &page->flags);
  	else {
@@ -56,13 +66,15 @@
  #include <asm/glue-cache.h>
  
  #ifndef MULTI_CACHE
+-#define dmac_map_area			__glue(_CACHE,_dma_map_area)
+-#define dmac_unmap_area 		__glue(_CACHE,_dma_unmap_area)
 +#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
- #define dmac_map_area			__glue(_CACHE,_dma_map_area)
- #define dmac_unmap_area 		__glue(_CACHE,_dma_unmap_area)
++# define dmac_map_area			__glue(_CACHE,_dma_map_area)
++# define dmac_unmap_area 		__glue(_CACHE,_dma_unmap_area)
 +#else
-+#define dmac_map_area			__glue(fiq,_dma_map_area)
-+#define dmac_unmap_area			__glue(fiq,_dma_unmap_area)
-+#endif /* CONFIG_DMA_CACHE_FIQ_BROADCAST */
++# define dmac_map_area			__glue(fiq,_dma_map_area)
++# define dmac_unmap_area			__glue(fiq,_dma_unmap_area)
++#endif
  
  /*
   * These are private to the dma-mapping API.  Do not use directly.
diff --git a/target/linux/oxnas/profiles/00-default.mk b/target/linux/oxnas/profiles/00-default.mk
index 67f866ee80..fedf730088 100644
--- a/target/linux/oxnas/profiles/00-default.mk
+++ b/target/linux/oxnas/profiles/00-default.mk
@@ -7,11 +7,11 @@
 
 define Profile/Default
 	NAME:=Default Profile
+	PRIORITY:=1
 	PACKAGES:=\
-		kmod-usb-core kmod-usb3 kmod-ledtrig-usbdev \
-		kmod-usb-storage \
-		kmod-i2c-gpio kmod-rtc-pcf8563 kmod-rtc-ds1307 \
-		kmod-gpio-beeper kmod-hwmon-core kmod-hwmon-gpiofan
+		kmod-i2c-gpio kmod-gpio-beeper kmod-hwmon-core \
+		kmod-hwmon-gpiofan kmod-rtc-pcf8563 kmod-rtc-ds1307 \
+		kmod-usb3
 endef
 
 define Profile/Default/Description
diff --git a/target/linux/oxnas/profiles/akitio.mk b/target/linux/oxnas/profiles/akitio.mk
deleted file mode 100644
index a10860101a..0000000000
--- a/target/linux/oxnas/profiles/akitio.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/AKITIO
-  NAME:=Akitio MyCloud mini / Silverstone DC01
-  PACKAGES:= \
-	kmod-usb-storage kmod-i2c-gpio kmod-rtc-ds1307
-endef
-
-define Profile/AKITIO/Description
- Profile for the Akitio MyCloud mini aka. Silverstone DC01
-endef
-
-$(eval $(call Profile,AKITIO))
diff --git a/target/linux/oxnas/profiles/cloudengines.mk b/target/linux/oxnas/profiles/cloudengines.mk
deleted file mode 100644
index ed0a235254..0000000000
--- a/target/linux/oxnas/profiles/cloudengines.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/POGOPLUG_PRO
-  NAME:=Cloud Engines Pogoplug Pro
-endef
-
-define Profile/POGOPLUG_PRO/Description
- Profile with built-in ox820 Pogoplug Pro device-tree
- (board with miniPCIe slot)
-endef
-
-define Profile/POGOPLUG_V3
-  NAME:=Cloud Engines Pogoplug V3
-endef
-
-define Profile/POGOPLUG_V3/Description
- Profile with built-in ox820 Pogoplug V3 device-tree
- (board without miniPCIe slot)
-endef
-
-$(eval $(call Profile,POGOPLUG_PRO))
-$(eval $(call Profile,POGOPLUG_V3))
diff --git a/target/linux/oxnas/profiles/mitrastar.mk b/target/linux/oxnas/profiles/mitrastar.mk
deleted file mode 100644
index 1991c9b688..0000000000
--- a/target/linux/oxnas/profiles/mitrastar.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/STG212
-  NAME:=MitraStar STG-212
-endef
-
-define Profile/STG212/Description
- Profile with built-in ox820 STG-212 device-tree
-endef
-
-$(eval $(call Profile,STG212))
diff --git a/target/linux/oxnas/profiles/shuttle.mk b/target/linux/oxnas/profiles/shuttle.mk
deleted file mode 100644
index a83935f9c5..0000000000
--- a/target/linux/oxnas/profiles/shuttle.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/KD20
-  NAME:=Shuttle KD20
-  PACKAGES:= \
-	kmod-usb3 kmod-usb-storage kmod-i2c-gpio kmod-rtc-pcf8563 \
-	kmod-gpio-beeper kmod-hwmon-core kmod-hwmon-gpiofan
-endef
-
-define Profile/KD20/Description
- Profile with built-in ox820 KD20 device-tree
-endef
-
-$(eval $(call Profile,KD20))