Merge branch 'build-linux-kernel-v4.8.17'

Author: ikwzm

Readme.md

@@ -1,7 +1,7 @@
 
 prefix   ?= ./
 curr_dir ?= $(shell pwd)
-lib_dir  ?= $(prefix)/lib/modules/4.4.7-armv7-fpga/ikwzm
+lib_dir  ?= $(prefix)/lib/modules/4.8.17-armv7-fpga/ikwzm
 
 kmod_objects += dtbocfg/dtbocfg.ko
 kmod_objects += fpgacfg/fpgacfg.ko
@@ -16,12 +16,12 @@ kmod_subdirs  = $(dir $(kmod_objects))
 
 all:
 	for dir in $(kmod_subdirs); do \
-		cd $$dir ; $(MAKE) KERNEL_SRC_DIR=$(curr_dir)/../linux-4.4.7-armv7-fpga all   ; cd $(curr_dir) ;\
+		cd $$dir ; $(MAKE) KERNEL_SRC_DIR=$(curr_dir)/../linux-4.8.17-armv7-fpga all   ; cd $(curr_dir) ;\
 	done
 
 clean:
 	for dir in $(kmod_subdirs); do \
-		cd $$dir ; $(MAKE) KERNEL_SRC_DIR=$(curr_dir)/../linux-4.4.7-armv7-fpga clean ; cd $(curr_dir) ;\
+		cd $$dir ; $(MAKE) KERNEL_SRC_DIR=$(curr_dir)/../linux-4.8.17-armv7-fpga clean ; cd $(curr_dir) ;\
 	done
 
 install: all

drivers/Makefile

@@ -8,9 +8,9 @@ Homepage: <https://github.com/ikwzm/FPGA-SoC-Linux>
 #Vcs-Git: git://anonscm.debian.org/collab-maint/fpga-soc-linux-drivers.git
 #Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/fpga-soc-linux-drivers.git;a=summary
 
-Package: fpga-soc-linux-drivers-4.4.7-armv7-fpga
+Package: fpga-soc-linux-drivers-4.8.17-armv7-fpga
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, linux-image-4.4.7-armv7-fpga
+Depends: ${shlibs:Depends}, ${misc:Depends}, linux-image-4.8.17-armv7-fpga
 Description: FPGA+SoC+Linux device drivers
  FPGA+SoC+Linux device drivers.
   dtbocfg: Device Tree Blob Overlay Configuration File System.

drivers/debian/control

@@ -1,6 +1,6 @@
 /*********************************************************************************
  *
- *       Copyright (C) 2016 Ichiro Kawazome
+ *       Copyright (C) 2016-2017 Ichiro Kawazome
  *       All rights reserved.
  * 
  *       Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,7 @@
 #include <linux/stat.h>
 #include <linux/limits.h>
 #include <linux/file.h>
+#include <linux/version.h>
 
 /**
  * Device Tree Overlay Item Structure
@@ -58,7 +59,11 @@ static int dtbocfg_overlay_item_create(struct dtbocfg_overlay_item *overlay)
 {
     int ret_val;
 
+#if     (LINUX_VERSION_CODE >= 0x040700)
+    of_fdt_unflatten_tree(overlay->dtbo, NULL, &overlay->node);
+#else
     of_fdt_unflatten_tree(overlay->dtbo, &overlay->node);
+#endif
     if (overlay->node == NULL) {
         pr_err("%s: failed to unflatten tree\n", __func__);
         ret_val = -EINVAL;