From 953c538fef76335a042a2e3a26ffc0237414d913 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Fri, 19 Oct 2018 22:08:41 +0000
Subject: [PATCH] projects/rpi: move device settings to device options

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 projects/RPi/devices/RPi/options    |  9 +++++++++
 projects/RPi/devices/RPi2/options   |  9 +++++++++
 projects/RPi/devices/Slice/options  | 16 ++++++++++++++++
 projects/RPi/devices/Slice3/options | 16 ++++++++++++++++
 projects/RPi/options                | 26 --------------------------
 5 files changed, 50 insertions(+), 26 deletions(-)
 create mode 100644 projects/RPi/devices/RPi/options
 create mode 100644 projects/RPi/devices/RPi2/options

diff --git a/projects/RPi/devices/RPi/options b/projects/RPi/devices/RPi/options
new file mode 100644
index 0000000000..3ee3c69ab0
--- /dev/null
+++ b/projects/RPi/devices/RPi/options
@@ -0,0 +1,9 @@
+################################################################################
+# Device defaults
+################################################################################
+
+  # 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"'
diff --git a/projects/RPi/devices/RPi2/options b/projects/RPi/devices/RPi2/options
new file mode 100644
index 0000000000..fc193853ce
--- /dev/null
+++ b/projects/RPi/devices/RPi2/options
@@ -0,0 +1,9 @@
+################################################################################
+# Device defaults
+################################################################################
+
+  # NOOBS supported hex versions (legacy)
+    NOOBS_HEX="1040,1041,2082"
+
+  # NOOBS supported model versions
+    NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
diff --git a/projects/RPi/devices/Slice/options b/projects/RPi/devices/Slice/options
index 612ff1b53c..be9ad09866 100644
--- a/projects/RPi/devices/Slice/options
+++ b/projects/RPi/devices/Slice/options
@@ -1,2 +1,18 @@
+################################################################################
+# Device defaults
+################################################################################
+
   # Additional kernel make parameters
     KERNEL_MAKE_EXTRACMD+=" overlays/slice.dtbo overlays/ws2812.dtbo"
+
+  # 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"'
+
+  # Additional Firmware
+    FIRMWARE="${FIRMWARE} slice-firmware"
+
+  # Additional drivers
+    ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS} slice-drivers"
diff --git a/projects/RPi/devices/Slice3/options b/projects/RPi/devices/Slice3/options
index 612ff1b53c..fdc7c920e9 100644
--- a/projects/RPi/devices/Slice3/options
+++ b/projects/RPi/devices/Slice3/options
@@ -1,2 +1,18 @@
+################################################################################
+# Device defaults
+################################################################################
+
   # Additional kernel make parameters
     KERNEL_MAKE_EXTRACMD+=" overlays/slice.dtbo overlays/ws2812.dtbo"
+
+  # NOOBS supported hex versions (legacy)
+    NOOBS_HEX="1040,1041,2082"
+
+  # NOOBS supported model versions
+    NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
+
+  # Additional Firmware
+    FIRMWARE="${FIRMWARE} slice-firmware"
+
+  # Additional drivers
+    ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS} slice-drivers"
diff --git a/projects/RPi/options b/projects/RPi/options
index d77c883390..0151033f93 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -60,24 +60,6 @@
   # default:  default mainline kernel
     LINUX="raspberrypi"
 
-if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Slice" ]; 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" -o "$DEVICE" = "Slice3" ]; 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
 ################################################################################
@@ -129,10 +111,6 @@ fi
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
     FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware-rpi"
 
-  if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
-    FIRMWARE="$FIRMWARE slice-firmware"
-  fi
-
   # build and install ATV IR remote support (yes / no)
     ATVCLIENT_SUPPORT="no"
 
@@ -152,10 +130,6 @@ fi
   # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
     ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS rpi-cirrus-config"
 
-  if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS slice-drivers"
-  fi
-
   # build and install driver addons (yes / no)
     DRIVER_ADDONS_SUPPORT="yes"