diff --git a/projects/RPi/options b/projects/RPi/options
index 1a5d366e63..a4248b565d 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -17,7 +17,12 @@
         # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
         # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
         # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
-        TARGET_CPU="arm1176jzf-s"
+
+        if [ "$DEVICE" = "RPi" ]; then
+          TARGET_CPU="arm1176jzf-s"
+        elif [ "$DEVICE" = "RPi2" ]; then
+          TARGET_CPU="cortex-a7"
+        fi
 
         # TARGET_FLOAT:
         # Specifies which floating-point ABI to use. Permissible values are:
@@ -30,7 +35,13 @@
         # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
         # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
         # neon-vfpv4.
-        TARGET_FPU="vfp"
+
+        if [ "$DEVICE" = "RPi" ]; then
+          TARGET_FPU="vfp"
+        elif [ "$DEVICE" = "RPi2" ]; then
+          TARGET_FPU="neon-vfpv4"
+        fi
+
         ;;
     esac
 
@@ -59,12 +70,24 @@
   # default:  default mainline kernel
     LINUX="default"
 
+if [ "$DEVICE" = "RPi" ]; then
+
   # NOOBS supported hex versions (legacy)
     NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092,0093"
 
   # NOOBS supported model versions
     NOOBS_SUPPORTED_MODELS='"Pi Model","Pi Compute Module","Pi Zero"'
 
+elif [ "$DEVICE" = "RPi2" ]; then
+
+  # NOOBS supported hex versions (legacy)
+    NOOBS_HEX="1040,1041,2082"
+
+  # NOOBS supported model versions
+    NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
+
+fi
+
 ################################################################################
 # setup build defaults
 ################################################################################