Merge pull request #179 from yozik04/master

RPI2 autodetection

Makefile

@@ -27,6 +27,11 @@ HEADER_DIR=${PREFIX}/include/RF24
 # The base location of support files for different devices
 ARCH_DIR=utility
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 # The default objects to compile
 OBJECTS=RF24.o spi.o
 
@@ -57,7 +62,7 @@ OBJECTS+=bcm2835.o
 OBJECTS+=interrupt.o
 SHARED_LINKER_FLAGS+=-pthread
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 
 else
 DRIVER_DIR=$(ARCH_DIR)/BBB

examples_RPi/Makefile

@@ -16,9 +16,14 @@ prefix := /usr/local
 # Detect the Raspberry Pi by the existence of the bcm_host.h file
 BCMLOC=/opt/vc/include/bcm_host.h
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 ifneq ("$(wildcard $(BCMLOC))","")
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 endif
 
 # define all programs

examples_RPi/extra/Makefile

@@ -13,8 +13,13 @@
 #
 prefix := /usr/local
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 #CCFLAGS=
 
 # define all programs

examples_RPi/interrupts/Makefile

@@ -13,12 +13,17 @@
 #
 prefix := /usr/local
 
+ARCH=armv6zk
+ifeq "$(shell uname -m)" "armv7l"
+ARCH=armv7-a
+endif
+
 # Detect the Raspberry Pi by the existence of the bcm_host.h file
 BCMLOC=/opt/vc/include/bcm_host.h
 
 ifneq ("$(wildcard $(BCMLOC))","")
 # The recommended compiler flags for the Raspberry Pi
-CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s
+CCFLAGS=-Ofast -mfpu=vfp -mfloat-abi=hard -march=$(ARCH) -mtune=arm1176jzf-s
 endif
 
 # define all programs