From: Miroslav Ondra <ondra@faster.cz>
Date: Thu, 14 Jun 2018 09:51:55 +0000 (+0200)
Subject: Merge
X-Git-Url: http://git.graph-it.com/?a=commitdiff_plain;h=a9e956fd6204908d8ab490c514abdf7c7e2196c7;p=graphit%2Funipi-kernel.git

Merge
---

a9e956fd6204908d8ab490c514abdf7c7e2196c7
diff --cc Makefile
index 89d99a2,89d99a2..97ee527
--- a/Makefile
+++ b/Makefile
@@@ -7,7 -7,7 +7,8 @@@ MODULES_LIST = unipi
  TRANSFER_MODULE = unipi/
  
  .PHONY: default
--default: symlink ;
++#default: symlink ;
++default: all ;
  
  all: 
  	for m in ${MODULES_LIST}; do\
diff --cc modules/unipi/Makefile
index a545188,a545188..0f13fbc
--- a/modules/unipi/Makefile
+++ b/modules/unipi/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  # if necessary.
   
  SYMLINK_DIR_PATH = /run/kernel/neuron_spi
--LINUX_DIR_PATH = /root/linux/4_9_14/linux/
++LINUX_DIR_PATH = /root/bokula/linux/
  SRC_DIR_PATH = $(PWD)/src
  BIN_DIR_PATH = $(PWD)/bin
  
@@@ -44,7 -44,7 +44,7 @@@ unipi-objs := ${OBJ_FILES
  TARGET_PLC_PATH = tomunipi:
  
  .PHONY: default
--default: symlink ;
++default: all ;
  
  all: 
  	make ARCH=arm CROSS_COMPILE=${CCPREFIX} -C ${LINUX_DIR_PATH} M=${PWD} modules
diff --cc version.txt
index bfd2790,6e4902b..0000000
deleted file mode 100644,100644
--- a/version.txt
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:41(0329dbf) LatestCommit:Thu Jun 14 11:44:07 CEST 2018
 -Repository:neuron-kernel ActiveBranch:[master] PrecedingRelease:v.0.10 PrecedingRevision:42(0856d36) LatestCommit:Thu Jun 14 11:49:23 CEST 2018