From 8453016608b9c163a9806f538548493a212b2357 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Tue, 28 Jul 2015 17:10:21 +0200
Subject: [PATCH 1/2] Add ODROID-C1 support to Makefile

---
 shell/linux/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index c3d41f7b7..0c7db87a0 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -39,6 +39,8 @@ ifeq (,$(platform))
             platform = beagle
         else ifneq (,$(findstring Pandora,$(HARDWARE)))
             platform = pandora
+        else ifneq (,$(findstring ODROIDC,$(HARDWARE)))
+            platform = odroidc1
         else
             $(error Unsupported Hardware)
         endif
@@ -107,6 +109,14 @@ else ifneq (,$(findstring pandora,$(platform)))
     ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
     CFLAGS += -D TARGET_PANDORA  -D WEIRD_SLOWNESS -fsingle-precision-constant
 
+# ODROID-C1
+else ifneq (,$(findstring odroidc1,$(platform)))
+    AS=${CC_PREFIX}gcc
+    MFLAGS += -marm -march=armv7-a -mtune=cortex-a5 -mfpu=neon -mfloat-abi=hard -funroll-loops
+    ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=hard
+    CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP
+    USE_GLES := 1
+
 # GCW Zero
 else ifneq (,$(findstring gcwz,$(platform)))
     NOT_ARM := 1

From 1ec91c30d80a931a50d6adac7240a0085b0d03e2 Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Sun, 2 Aug 2015 16:41:36 +0200
Subject: [PATCH 2/2] Add support for ODROID-C1+/X/X2/U2/U3/XU/XU3/XU4

---
 shell/linux/Makefile | 43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/shell/linux/Makefile b/shell/linux/Makefile
index 0c7db87a0..923da4f0a 100644
--- a/shell/linux/Makefile
+++ b/shell/linux/Makefile
@@ -41,6 +41,18 @@ ifeq (,$(platform))
             platform = pandora
         else ifneq (,$(findstring ODROIDC,$(HARDWARE)))
             platform = odroidc1
+        else ifneq (,$(findstring ODROID-XU3,$(HARDWARE)))
+            platform = odroidxu3
+        else ifneq (,$(findstring ODROIDXU,$(HARDWARE)))
+            platform = odroidxu
+        else ifneq (,$(findstring ODROIDX2,$(HARDWARE)))
+            platform = odroidx2
+        else ifneq (,$(findstring ODROIDX,$(HARDWARE)))
+            platform = odroidx
+        else ifneq (,$(findstring ODROID-U2/U3,$(HARDWARE)))
+            platform = odroidu2
+        else ifneq (,$(findstring ODROIDU2,$(HARDWARE)))
+            platform = odroidu2
         else
             $(error Unsupported Hardware)
         endif
@@ -109,14 +121,35 @@ else ifneq (,$(findstring pandora,$(platform)))
     ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
     CFLAGS += -D TARGET_PANDORA  -D WEIRD_SLOWNESS -fsingle-precision-constant
 
-# ODROID-C1
-else ifneq (,$(findstring odroidc1,$(platform)))
+# ODROIDs
+else ifneq (,$(findstring odroid,$(platform)))
     AS=${CC_PREFIX}gcc
-    MFLAGS += -marm -march=armv7-a -mtune=cortex-a5 -mfpu=neon -mfloat-abi=hard -funroll-loops
-    ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=hard
-    CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP
+    MFLAGS += -marm -mfpu=neon -mfloat-abi=hard -funroll-loops
+    ASFLAGS += -mfpu=neon -mfloat-abi=hard
+    CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP -fsingle-precision-constant
     USE_GLES := 1
 
+    # ODROID-XU3, -XU3 Lite & -XU4
+    ifneq (,$(findstring odroidxu3,$(platform)))
+        MFLAGS += -march=armv7ve -mtune=cortex-a15.cortex-a7
+        ASFLAGS += -march=armv7ve
+
+    # Other ODROIDs
+    else
+        MFLAGS += -march=armv7-a
+        ASFLAGS += -march=armv7-a
+
+        # ODROID-C1 & -C1+
+        ifneq (,$(findstring odroidc1,$(platform)))
+            MFLAGS += -mtune=cortex-a5
+
+        # ODROID-U2, -U3, -X & -X2
+        else
+            MFLAGS += -mtune=cortex-a9
+
+        endif
+    endif
+
 # GCW Zero
 else ifneq (,$(findstring gcwz,$(platform)))
     NOT_ARM := 1