diff --git a/projects/ATV/options b/projects/ATV/options
index 3a54013558..f78ba50fb9 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -43,7 +43,31 @@
       #               athlon-fx amdfam10 barcelona
       # (Intel CPUs)  atom core2 nocona
       #
-      TARGET_CPU="i686"
+      TARGET_CPU="core2"
+      ;;
+
+    arm)
+      # TARGET_CPU:
+      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+      # arm720t arm740t strongarm strongarm110 strongarm1100
+      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+      # 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="cortex-a9"
+
+      # TARGET_FPU:
+      # This specifies what floating point hardware (or hardware emulation) is
+      # available on the target. Permissible names are:
+      # 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="neon"
       ;;
   esac
 
@@ -53,6 +77,12 @@
 # Project CFLAGS
   PROJECT_CFLAGS=""
 
+# Bootloader to use (syslinux / u-boot)
+  BOOTLOADER=""
+
+# Configuration for u-boot
+  UBOOT_CONFIG=""
+
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index b09d15d9e3..7fbce6f305 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -43,7 +43,31 @@
       #               athlon-fx amdfam10 barcelona
       # (Intel CPUs)  atom core2 nocona
       #
-      TARGET_CPU="i686"
+      TARGET_CPU="core2"
+      ;;
+
+    arm)
+      # TARGET_CPU:
+      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+      # arm720t arm740t strongarm strongarm110 strongarm1100
+      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+      # 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="cortex-a9"
+
+      # TARGET_FPU:
+      # This specifies what floating point hardware (or hardware emulation) is
+      # available on the target. Permissible names are:
+      # 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="neon"
       ;;
   esac
 
@@ -53,6 +77,12 @@
 # Project CFLAGS
   PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse"
 
+# Bootloader to use (syslinux / u-boot)
+  BOOTLOADER="syslinux"
+
+# Configuration for u-boot
+  UBOOT_CONFIG=""
+
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
 
diff --git a/projects/ION/options b/projects/ION/options
index 97ed1da186..3cbd06ef0f 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -45,6 +45,30 @@
       #
       TARGET_CPU="atom"
       ;;
+
+    arm)
+      # TARGET_CPU:
+      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+      # arm720t arm740t strongarm strongarm110 strongarm1100
+      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+      # 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="cortex-a9"
+
+      # TARGET_FPU:
+      # This specifies what floating point hardware (or hardware emulation) is
+      # available on the target. Permissible names are:
+      # 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="neon"
+      ;;
   esac
 
 # Build optimizations (size/normal/speed)
@@ -53,6 +77,12 @@
 # Project CFLAGS
   PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
 
+# Bootloader to use (syslinux / u-boot)
+  BOOTLOADER="syslinux"
+
+# Configuration for u-boot
+  UBOOT_CONFIG=""
+
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index d5071596ee..550db58974 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -45,6 +45,30 @@
       #
       TARGET_CPU="core2"
       ;;
+
+    arm)
+      # TARGET_CPU:
+      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+      # arm720t arm740t strongarm strongarm110 strongarm1100
+      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+      # 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="cortex-a9"
+
+      # TARGET_FPU:
+      # This specifies what floating point hardware (or hardware emulation) is
+      # available on the target. Permissible names are:
+      # 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="neon"
+      ;;
   esac
 
 # Build optimizations (size/speed)
@@ -53,6 +77,12 @@
 # Project CFLAGS
   PROJECT_CFLAGS=""
 
+# Bootloader to use (syslinux / u-boot)
+  BOOTLOADER="syslinux"
+
+# Configuration for u-boot
+  UBOOT_CONFIG=""
+
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"