Skip to content

Commit

Permalink
Merge branch 'build-linux-kernel-v4.8.17'
Browse files Browse the repository at this point in the history
  • Loading branch information
ikwzm committed Jan 13, 2017
2 parents a9d2cd6 + c43dec5 commit 55d44b8
Show file tree
Hide file tree
Showing 36 changed files with 4,367 additions and 148 deletions.
171 changes: 95 additions & 76 deletions Readme.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions drivers/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions drivers/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 6 additions & 1 deletion drivers/dtbocfg/dtbocfg.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
Binary file removed drivers/dtbocfg/dtbocfg.ko
Binary file not shown.
Binary file removed drivers/fclkcfg/fclkcfg.ko
Binary file not shown.
Binary file removed drivers/fpga-bridge/altera-fpga2sdram.ko
Binary file not shown.
Binary file removed drivers/fpga-bridge/altera-hps2fpga.ko
Binary file not shown.
Binary file removed drivers/fpga-bridge/fpga-bridge.ko
Binary file not shown.
Binary file removed drivers/fpgacfg/fpgacfg.ko
Binary file not shown.
Binary file removed drivers/udmabuf/udmabuf.ko
Binary file not shown.
Binary file removed drivers/zptty/zptty.ko
Binary file not shown.
Loading

0 comments on commit 55d44b8

Please sign in to comment.