jacinto6: sgx-bin: bins and src update for ddk1.14

Updating SGX binaries and KM source update for DDK1.14 on k4.4

Change-Id: Ie51645aa42e31c620f2e50cdb1efd570a1ef7227
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>

18 files changed, 404 insertions, 243 deletions

diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
index ce0608c..b93243b 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/buildvars.mk
@@ -76,7 +76,7 @@ COMMON_USER_FLAGS += -fno-strict-aliasing
 # We always enable debugging. Either the release binaries are stripped
 # and the symbols put in the symbolpackage, or we're building debug.
 #
-COMMON_USER_FLAGS += -g
+COMMON_USER_FLAGS += -g $(ANDROID_FPGA_FORCE_32BIT)
 
 # User C and User C++ warning flags
 #
@@ -167,6 +167,7 @@ TESTED_KBUILD_FLAGS := \
  $(call kernel-cc-option,-Wno-pointer-arith) \
  $(call kernel-cc-option,-Wno-aggregate-return) \
  $(call kernel-cc-option,-Wno-unused-but-set-variable) \
+ $(call kernel-cc-option,-Wno-old-style-declaration) \
  $(call kernel-cc-optional-warning,-Wbad-function-cast) \
  $(call kernel-cc-optional-warning,-Wcast-qual) \
  $(call kernel-cc-optional-warning,-Wcast-align) \
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk
index 093bb1c..ab7a0e9 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/commands.mk
@@ -88,7 +88,7 @@ endef
 define target-executable-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
 $(CC) \
-        $(SYS_EXE_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
+        $(SYS_EXE_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
         $(SYS_EXE_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_EXE_CRTEND) \
         $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
 endef
@@ -96,7 +96,7 @@ endef
 define target-executable-cxx-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
 $(CXX) \
-        $(SYS_EXE_LDFLAGS_CXX) $(SYS_EXE_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
+        $(SYS_EXE_LDFLAGS_CXX) $(SYS_EXE_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
         $(SYS_EXE_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_EXE_CRTEND) \
         $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
 endef
@@ -104,7 +104,7 @@ endef
 define target-shared-library-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
 $(CC) -shared -Wl,-Bsymbolic \
-        $(SYS_LIB_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
+        $(SYS_LIB_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
         $(SYS_LIB_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_LIB_CRTEND) \
         $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
 endef
@@ -114,7 +114,7 @@ endef
 define target-shared-library-cxx-from-o
 $(if $(V),,@echo "  LD      " $(call relative-to-top,$@))
 $(CXX) -shared -Wl,-Bsymbolic \
-        $(SYS_LIB_LDFLAGS_CXX) $(SYS_LIB_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
+        $(SYS_LIB_LDFLAGS_CXX) $(SYS_LIB_LDFLAGS) $(SYS_COMMON_LDFLAGS) $(MODULE_LDFLAGS) -o $@ \
         $(SYS_LIB_CRTBEGIN) $(sort $(MODULE_ALL_OBJECTS)) $(SYS_LIB_CRTEND) \
         $(MODULE_LIBRARY_DIR_FLAGS) $(MODULE_LIBRARY_FLAGS) $(LIBGCC)
 endef
@@ -183,7 +183,11 @@ define make-directory
 $(MKDIR) -p $@
 endef
 
+define check-exports-from-file
+endef
+
 define check-exports
+$(call check-exports-from-file,$(if $1,$1,$(notdir $@).txt))
 endef
 
 # Programs used in recipes
@@ -197,6 +201,7 @@ JAR ?= jar
 JAVA ?= java
 JAVAC ?= javac
 ZIP ?= zip
+PKG_CONFIG ?= pkg-config
 
 ifeq ($(USE_CCACHE),1)
 CCACHE ?= ccache
@@ -228,10 +233,10 @@ override CC  := $(if $(V),,@)$(CCACHE) $(CC)
 override CXX := $(if $(V),,@)$(CCACHE) $(CXX)
 endif
 
-override AR                             := $(if $(V),,@)$(CROSS_COMPILE)ar
+override AR                     := $(if $(V),,@)$(CROSS_COMPILE)ar
 override BISON                  := $(if $(V),,@)$(BISON)
 override BZIP2                  := $(if $(V),,@)bzip2 -9
-override CP                             := $(if $(V),,@)cp
+override CP                     := $(if $(V),,@)cp
 override ECHO                   := $(if $(V),,@)echo
 override FLEX                   := $(if $(V),,@)flex
 override GAWK                   := $(if $(V),,@)gawk
@@ -244,13 +249,14 @@ override INSTALL		:= $(if $(V),,@)install
 override JAR                    := $(if $(V),,@)$(JAR)
 override JAVA                   := $(if $(V),,@)$(JAVA)
 override JAVAC                  := $(if $(V),,@)$(JAVAC)
-override M4                             := $(if $(V),,@)m4
+override LN                     := $(if $(V),,@)ln -f
+override M4                     := $(if $(V),,@)m4
 override MKDIR                  := $(if $(V),,@)mkdir
-override MV                             := $(if $(V),,@)mv
+override MV                     := $(if $(V),,@)mv
 override OBJCOPY                := $(if $(V),,@)$(CROSS_COMPILE)objcopy
 override PDSASM                 := $(if $(V),,@)$(HOST_OUT)/pdsasm
 override RANLIB                 := $(if $(V),,@)$(CROSS_COMPILE)ranlib
-override RM                             := $(if $(V),,@)rm -f
+override RM                     := $(if $(V),,@)rm -f
 override SED                    := $(if $(V),,@)sed
 override STRIP                  := $(if $(V),,@)$(CROSS_COMPILE)strip
 override TAR                    := $(if $(V),,@)tar
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk
index d658679..bf3fe11 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/arch_common.mk
@@ -56,23 +56,40 @@ SYS_CFLAGS := \
 SYS_INCLUDES := \
  -isystem $(ANDROID_ROOT)/bionic/libc/arch-$(ANDROID_ARCH)/include \
  -isystem $(ANDROID_ROOT)/bionic/libc/include \
- -isystem $(ANDROID_ROOT)/bionic/libc/kernel/common \
- -isystem $(ANDROID_ROOT)/bionic/libc/kernel/arch-$(ANDROID_ARCH) \
+ -isystem $(ANDROID_ROOT)/bionic/libc/kernel/uapi \
+ -isystem $(ANDROID_ROOT)/bionic/libc/kernel/uapi/asm-$(ANDROID_ARCH) \
  -isystem $(ANDROID_ROOT)/bionic/libm/include \
  -isystem $(ANDROID_ROOT)/bionic/libm/include/$(ANDROID_ARCH) \
  -isystem $(ANDROID_ROOT)/bionic/libthread_db/include \
+ -isystem $(ANDROID_ROOT)/external/libunwind/include \
  -isystem $(ANDROID_ROOT)/frameworks/base/include \
- -isystem $(ANDROID_ROOT)/system/core/include \
  -isystem $(ANDROID_ROOT)/hardware/libhardware/include \
- -isystem $(ANDROID_ROOT)/external/openssl/include \
+ -isystem $(ANDROID_ROOT)/hardware/libhardware_legacy/include \
+ -isystem $(ANDROID_ROOT)/system/core/include \
+ -isystem $(ANDROID_ROOT)/system/core/libsync/include \
  -isystem $(ANDROID_ROOT)/system/media/camera/include \
- -isystem $(ANDROID_ROOT)/hardware/libhardware_legacy/include
+ -isystem $(ANDROID_ROOT)/external/libdrm \
+ -isystem $(ANDROID_ROOT)/external/libdrm/include/drm
+
+ifneq ($(wildcard $(ANDROID_ROOT)/external/boringssl/src/include),)
+SYS_INCLUDES += \
+ -isystem $(ANDROID_ROOT)/external/boringssl/src/include
+else
+SYS_INCLUDES += \
+ -isystem $(ANDROID_ROOT)/external/openssl/include
+endif
+
+# Obsolete libc includes
+SYS_INCLUDES += \
+ -isystem $(ANDROID_ROOT)/bionic/libc/kernel/common \
+ -isystem $(ANDROID_ROOT)/bionic/libc/kernel/arch-$(ANDROID_ARCH)
 
 # This is comparing PVR_BUILD_DIR to see if it is omap and adding 
 # includes required for it's HWC
 ifeq ($(notdir $(abspath .)),omap_android)
 SYS_INCLUDES += \
- -isystem $(ANDROID_ROOT)/hardware/ti/omap4xxx/kernel-headers
+ -isystem $(ANDROID_ROOT)/hardware/ti/omap4xxx/kernel-headers \
+ -isystem $(ANDROID_ROOT)/hardware/ti/omap4xxx/ion
 endif
 
 ifeq ($(_CLANG),true)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk
index bb47c8d..b8b97e2 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/extra_config.mk
@@ -39,8 +39,14 @@
 ### ###########################################################################
 
 
-$(eval $(call BothConfigC,ANDROID,))
+# On versions of Android prior to L, remap the use of libc++ to a combination
+# of stlport and libstdc++. Not every module written in C++ in the DDK needs
+# the STL, but linking it should be harmless (and most modules do need it).
+ifneq ($(is_at_least_lollipop),1)
+endif
+
 
+$(eval $(call BothConfigC,ANDROID,))
 
 
 
@@ -51,4 +57,15 @@ $(eval $(call TunableBothConfigMake,SUPPORT_PVRSRV_ANDROID_SYSTRACE,))
 $(eval $(call TunableBothConfigMake,PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC,))
 $(eval $(call TunableBothConfigC,PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC,))
 
+ifeq ($(NO_HARDWARE),1)
+ override PVR_ANDROID_COMPOSERHAL := null
+endif
+
+ifneq ($(PVR_ANDROID_COMPOSERHAL),drm)
+ ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),1)
+  override PVR_ANDROID_COMPOSERHAL := null
+ endif
+endif
+
+
 include ../common/ion.mk
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
index 7697f13..68e8132 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/features.mk
@@ -44,6 +44,7 @@ include ../common/android/platform_version.mk
 #
 SUPPORT_ANDROID_PLATFORM := 1
 SUPPORT_OPENGLES1_V1_ONLY := 1
+DONT_USE_SONAMES := 1
 
 # Meminfo IDs are required for buffer stamps
 #
@@ -51,8 +52,8 @@ SUPPORT_MEMINFO_IDS := 1
 
 # Enable services ion support by default
 #
-SUPPORT_ION := 0
-SUPPORT_DRM_GEM := 1
+SUPPORT_ION ?= 0
+SUPPORT_DMABUF := 1
 
 # Need multi-process support in PDUMP
 #
@@ -101,6 +102,14 @@ SUPPORT_LARGE_GENERAL_HEAP := 1
 #
 PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 5400
 
+# Unless overridden by the user, assume the RenderScript Compute API level
+# matches that of the SDK API_LEVEL.
+#
+RSC_API_LEVEL ?= $(API_LEVEL)
+ifneq ($(findstring $(RSC_API_LEVEL),21 22),)
+RSC_API_LEVEL := 20
+endif
+
 ##############################################################################
 # Framebuffer target extension is used to find configs compatible with
 # the framebuffer (added in JB MR1).
@@ -112,18 +121,10 @@ EGL_EXTENSION_ANDROID_FRAMEBUFFER_TARGET := 1
 #
 UNITTEST_INCLUDES := \
  eurasiacon/android \
- $(ANDROID_ROOT)/frameworks/base/native/include
-
-ifeq ($(is_at_least_jellybean),1)
-UNITTEST_INCLUDES += \
+ $(ANDROID_ROOT)/frameworks/base/native/include \
  $(ANDROID_ROOT)/frameworks/native/include \
  $(ANDROID_ROOT)/frameworks/native/opengl/include \
  $(ANDROID_ROOT)/libnativehelper/include/nativehelper
-else
-UNITTEST_INCLUDES += \
- $(ANDROID_ROOT)/frameworks/base/opengl/include \
- $(ANDROID_ROOT)/dalvik/libnativehelper/include/nativehelper
-endif
 
 # But it doesn't have OpenVG headers
 #
@@ -140,12 +141,21 @@ DEMO_DESTDIR := /system/vendor/bin
 EGL_DESTDIR := $(SHLIB_DESTDIR)/egl
 
 ##############################################################################
-# We can support OpenCL in the build since Froyo (stlport was added in 2.2)
+# In K and older, augment the libstdc++ includes with stlport includes. Any
+# part of the C++ library not implemented by stlport will be handled by
+# linking in libstdc++ too (see extra_config.mk).
+#
+# On L and newer, don't use stlport OR libstdc++ at all; just use libc++.
 #
 SYS_CXXFLAGS := -fuse-cxa-atexit $(SYS_CFLAGS)
+ifeq ($(is_at_least_lollipop),1)
+SYS_INCLUDES += \
+ -isystem $(ANDROID_ROOT)/external/libcxx/include
+else
 SYS_INCLUDES += \
  -isystem $(ANDROID_ROOT)/bionic \
  -isystem $(ANDROID_ROOT)/external/stlport/stlport
+endif
 
 ##############################################################################
 # Support the OES_EGL_image_external extensions in the client drivers.
@@ -167,122 +177,79 @@ EGL_EXTENSION_ANDROID_RECORDABLE := 1
 EGL_EXTENSION_ANDROID_BLOB_CACHE := 1
 
 ##############################################################################
-# ICS and earlier should rate-limit composition by waiting for 3D renders
-# to complete in the compositor's eglSwapBuffers().
-#
-ifeq ($(is_at_least_jellybean),0)
-PVR_ANDROID_COMPOSITOR_WAIT_FOR_RENDER := 1
-endif
-
-##############################################################################
 # JB added a new corkscrew API for userland backtracing.
 #
-ifeq ($(is_at_least_jellybean),1)
+ifeq ($(is_at_least_lollipop),0)
 PVR_ANDROID_HAS_CORKSCREW_API := 1
 endif
 
 ##############################################################################
-# JB MR1 makes the framebuffer HAL obsolete.
-#
-# We also need to support IMPLEMENTATION_DEFINED so gralloc allocates
-# framebuffers and GPU buffers in a 'preferred' format.
-#
-ifeq ($(is_at_least_jellybean_mr1),0)
-SUPPORT_ANDROID_FRAMEBUFFER_HAL := 1
-else
-PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED := 1
-endif
-
-##############################################################################
 # JB MR1 introduces cross-process syncs associated with a fd.
 # This requires a new enough kernel version to have the base/sync driver.
 #
-ifeq ($(is_at_least_jellybean_mr1),1)
-EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC := 0
-PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC := 0
-endif
+EGL_EXTENSION_ANDROID_NATIVE_FENCE_SYNC ?= 1
+PVR_ANDROID_NATIVE_WINDOW_HAS_SYNC ?= 1
 
 ##############################################################################
-# JB MR1 introduces new usage bits for the camera HAL and some new formats.
+# Versions of Android between Cupcake and KitKat MR1 required Java 6.
 #
-ifeq ($(is_at_least_jellybean_mr1),1)
-PVR_ANDROID_HAS_GRALLOC_USAGE_HW_CAMERA := 1
-PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_RAW_SENSOR := 1
-PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_BLOB := 1
+ifeq ($(is_at_least_lollipop),0)
+LEGACY_USE_JAVA6 ?= 1
 endif
 
 ##############################################################################
-# JB MR2 adds a new graphics HAL (gralloc) API function, lock_ycbcr(), and
-# a so-called "flexible" YUV format enum.
+# Versions of Android between ICS and KitKat MR1 used ion .heap_mask instead
+# of .heap_id_mask.
 #
-ifeq ($(is_at_least_jellybean_mr2),1)
-PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_YCbCr_420_888 := 1
-PVR_ANDROID_GRALLOC_HAS_0_2_FEATURES := 1
+ifeq ($(is_at_least_lollipop),0)
+PVR_ANDROID_HAS_ION_FIELD_HEAP_MASK := 1
 endif
 
 ##############################################################################
-# In JB MR2 we can use a native helper library for the unittest wrapper.
-# In earlier versions, we must use a less ideal approach.
-#
-ifeq ($(is_at_least_jellybean_mr2),0)
-PVR_ANDROID_SURFACE_FIELD_NAME := \"mNativeSurface\"
-endif
-
-##############################################################################
-# JB MR2 introduces two new camera HAL formats (Y8, Y16)
-#
-ifeq ($(is_at_least_jellybean_mr2),1)
-PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_Y8 := 1
-PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_Y16 := 1
-endif
-
-##############################################################################
-# KK's EGL wrapper remaps EGLConfigs in the BGRA and BGRX formats to RGBA and
-# RGBX respectively, for CpuConsumer compatibility. It does this because the
-# usage bits for the gralloc allocation are not available to EGL.
-#
-# In this newer platform version, gralloc has been redefined to allow the
-# 'format' parameter to gralloc->alloc() to be ignored for non-USAGE_SW
-# allocations, so long as the bits per channel and sRGB-ness are preserved.
+# Lollipop supports 64-bit. Configure BCC to emit both 32-bit and 64-bit LLVM
+# bitcode in the renderscript driver.
 #
-ifeq ($(is_at_least_kitkat),1)
-PVR_ANDROID_REMAP_HW_ONLY_PIXEL_FORMATS := 1
+ifeq ($(is_at_least_lollipop),1)
+PVR_ANDROID_BCC_MULTIARCH_SUPPORT := 1
 endif
 
 ##############################################################################
-# Support newer HWC features in KK
+# Lollipop annotates the cursor allocation with USAGE_CURSOR to enable it to
+# be accelerated with special cursor hardware (rather than wasting an
+# overlay). This flag stops the DDK from blocking the allocation.
 #
-ifeq ($(is_at_least_kitkat),1)
-PVR_ANDROID_HWC_HAS_1_3_FEATURES := 1
+ifeq ($(is_at_least_lollipop),1)
+PVR_ANDROID_HAS_GRALLOC_USAGE_CURSOR := 1
 endif
 
 ##############################################################################
-# KK eliminated egl.cfg. Only create for older versions.
+# Lollipop changed the camera HAL metadata specification to require that
+# CONTROL_MAX_REGIONS specifies 3 integers (instead of 1).
 #
-ifeq ($(is_at_least_kitkat),0)
-PVR_ANDROID_HAS_EGL_CFG := 1
+ifeq ($(is_at_least_lollipop),1)
+PVR_ANDROID_CAMERA_CONTROL_MAX_REGIONS_HAS_THREE := 1
 endif
 
 ##############################################################################
-# KK has a bug in its browser that we need to work around.
+# Marshmallow needs --soname turned on
 #
-ifeq ($(is_at_least_kitkat),1)
-PVR_ANDROID_RELAX_GRALLOC_MODULE_MAP_CHECKS := 1
+ifeq ($(is_at_least_marshmallow),1)
+PVR_ANDROID_NEEDS_SONAME ?= 1
 endif
 
 ##############################################################################
-# KK's Camera HAL requires that ACTIVE_ARRAY_SIZE specify xmin/ymin first
+# Marshmallow replaces RAW_SENSOR with RAW10, RAW12 and RAW16
 #
-ifeq ($(is_at_least_kitkat),1)
-PVR_ANDROID_CAMERA_ACTIVE_ARRAY_SIZE_HAS_XMIN_YMIN := 1
+ifeq ($(is_at_least_marshmallow),1)
+PVR_ANDROID_HAS_HAL_PIXEL_FORMAT_RAWxx := 1
 endif
 
 ##############################################################################
-# KitKat added a new memory tracking HAL. This enables gralloc support for
-# the GRAPHICS/GL memtrack types.
+# Marshmallow onwards DDK stopped render script accleration using GPU.
+# This flag stops device alloction.
 #
-ifeq ($(is_at_least_kitkat),1)
-SUPPORT_ANDROID_MEMTRACK_HAL := 1
+ifeq ($(is_at_least_marshmallow),1)
+PVR_ANDROID_HAS_GRALLOC_USAGE_RENDERSCRIPT := 1
 endif
 
 # Placeholder for future version handling
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk
index 9717ca9..4309c72 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk
@@ -54,4 +54,4 @@ endif
 TOOLCHAIN ?= $(TARGET_ROOT)/product/$(TARGET_DEVICE)/obj
 TOOLCHAIN2 ?= $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system
 
-LIBGCC := $(shell $(CROSS_COMPILE)gcc -print-libgcc-file-name)
+LIBGCC := $(shell $(CROSS_COMPILE)gcc -m32 -print-libgcc-file-name 2>/dev/null)
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
index bf43dda..f2a5600 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/platform_version.mk
@@ -38,95 +38,117 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-# Figure out the version of Android we're building against.
+# If there's no build.prop file in the expected location, bail out. Tell the
+# user which file we were trying to read in case TARGET_DEVICE was not set.
 #
-PLATFORM_VERSION := $(shell \
-        if [ -f $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop ]; then \
-                cat $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop | \
-                        grep ^ro.build.version.release | cut -f2 -d'=' | cut -f1 -d'-'; \
-        else \
-                echo 5.0; \
-        fi)
+BUILD_PROP := $(TARGET_ROOT)/product/$(TARGET_DEVICE)/system/build.prop
+ifeq ($(wildcard $(BUILD_PROP)),)
+$(warning *** Could not determine Android version.  Did you set ANDROID_ROOT,\
+OUT_DIR and TARGET_DEVICE in your environment correctly?)
+$(error Error reading $(BUILD_PROP))
+endif
+
+# Extract version.release and version.codename from the build.prop file.
+# If either of the values aren't in the build.prop, the Make variables won't
+# be defined, and fallback handling will take place.
+#
+define newline
+
+
+endef
+$(eval $(subst #,$(newline),$(shell cat $(BUILD_PROP) | \
+        grep '^ro.build.version.release=\|^ro.build.version.codename=' | \
+        sed -e 's,ro.build.version.release=,PLATFORM_RELEASE=,' \
+            -e 's,ro.build.version.codename=,PLATFORM_CODENAME=,' | tr '\n' '#')))
 
-define version-starts-with
-$(shell echo $(PLATFORM_VERSION) | grep -q ^$(1); \
+define release-starts-with
+$(shell echo $(PLATFORM_RELEASE) | grep -q ^$(1); \
         [ "$$?" = "0" ] && echo 1 || echo 0)
 endef
 
 # ro.build.version.release contains the version number for release builds, or
 # the version codename otherwise. In this case we need to assume that the
 # version of Android we're building against has the features that are in the
-# final release of that version, so we set PLATFORM_VERSION to the
+# final release of that version, so we set PLATFORM_RELEASE to the
 # corresponding release number.
 #
 # NOTE: It's the _string_ ordering that matters here, not the version number
 # ordering. You need to make sure that strings that are sub-strings of other
 # checked strings appear _later_ in this list.
 #
-# e.g. 'JellyBeanMR' starts with 'JellyBean', but it is not JellyBean.
+# e.g. 'KitKatMR' starts with 'KitKat', but it is not KitKat.
+#
+# NOTE: The version codenames for Android stopped after KitKat, don't read
+# too much into the below names. They are mostly placeholders/reminders.
+#
+ifeq ($(call release-starts-with,KitKatMR),1)
+PLATFORM_RELEASE := 4.4.1
+else ifeq ($(call release-starts-with,KitKat),1)
+PLATFORM_RELEASE := 4.4
+else ifeq ($(call release-starts-with,LollipopMR1),1)
+PLATFORM_RELEASE := 5.1
+else ifeq ($(call release-starts-with,Lollipop),1)
+PLATFORM_RELEASE := 5.0
+else ifeq ($(call release-starts-with,Marshmallow),1)
+PLATFORM_RELEASE := 6.0
+else ifeq ($(PLATFORM_CODENAME),AOSP)
+# AOSP (master) will normally have PLATFORM_CODENAME set to AOSP
+PLATFORM_RELEASE := 6.0.60
+else ifeq ($(shell echo $(PLATFORM_RELEASE) | grep -qE "[A-Za-z]+"; echo $$?),0)
+PLATFORM_RELEASE := 6.1
+endif
+
+# Workaround for master. Sometimes there is an AOSP version ahead of
+# the current master version number, but master still has more features.
 #
-ifeq ($(call version-starts-with,JellyBeanMR1),1)
-PLATFORM_VERSION := 4.2
-else ifeq ($(call version-starts-with,JellyBeanMR),1)
-PLATFORM_VERSION := 4.3
-else ifeq ($(call version-starts-with,JellyBean),1)
-PLATFORM_VERSION := 4.1
-else ifeq ($(call version-starts-with,KeyLimePie),1)
-PLATFORM_VERSION := 4.4
-else ifeq ($(call version-starts-with,KitKat),1)
-PLATFORM_VERSION := 4.4
-else ifeq ($(shell echo $(PLATFORM_VERSION) | grep -qE "[A-Za-z]+"; echo $$?),0)
-PLATFORM_VERSION := 5.0
+ifeq ($(PLATFORM_RELEASE),6.0.60)
+PLATFORM_RELEASE := 6.1
+is_aosp_master := 1
 endif
 
-PLATFORM_VERSION_MAJ   := $(shell echo $(PLATFORM_VERSION) | cut -f1 -d'.')
-PLATFORM_VERSION_MIN   := $(shell echo $(PLATFORM_VERSION) | cut -f2 -d'.')
-PLATFORM_VERSION_PATCH := $(shell echo $(PLATFORM_VERSION) | cut -f3 -d'.')
+PLATFORM_RELEASE_MAJ   := $(shell echo $(PLATFORM_RELEASE) | cut -f1 -d'.')
+PLATFORM_RELEASE_MIN   := $(shell echo $(PLATFORM_RELEASE) | cut -f2 -d'.')
+PLATFORM_RELEASE_PATCH := $(shell echo $(PLATFORM_RELEASE) | cut -f3 -d'.')
 
 # Not all versions have a patchlevel; fix that up here
 #
-ifeq ($(PLATFORM_VERSION_PATCH),)
-PLATFORM_VERSION_PATCH := 0
+ifeq ($(PLATFORM_RELEASE_PATCH),)
+PLATFORM_RELEASE_PATCH := 0
 endif
 
 # Macros to help categorize support for features and API_LEVEL for tests.
 #
-is_at_least_jellybean := \
-        $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
-                                ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
-                                  test $(PLATFORM_VERSION_MIN) -ge 1 ) ) && echo 1 || echo 0)
-is_at_least_jellybean_mr1 := \
-        $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
-                                ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
-                                  test $(PLATFORM_VERSION_MIN) -ge 2 ) ) && echo 1 || echo 0)
-is_at_least_jellybean_mr2 := \
-        $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
-                                ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
-                                  test $(PLATFORM_VERSION_MIN) -ge 3 ) ) && echo 1 || echo 0)
-is_at_least_kitkat := \
-        $(shell ( test $(PLATFORM_VERSION_MAJ) -gt 4 || \
-                                ( test $(PLATFORM_VERSION_MAJ) -eq 4 && \
-                                  test $(PLATFORM_VERSION_MIN) -ge 4 ) ) && echo 1 || echo 0)
+is_at_least_lollipop := \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -ge 5 ) && echo 1 || echo 0)
+is_at_least_lollipop_mr1 := \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -gt 5 || \
+                                ( test $(PLATFORM_RELEASE_MAJ) -eq 5 && \
+                                  test $(PLATFORM_RELEASE_MIN) -gt 0 ) ) && echo 1 || echo 0)
+is_at_least_marshmallow := \
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -ge 6 ) && echo 1 || echo 0)
 
-# FIXME: Assume "future versions" are >=5.0, but we don't really know
+# Assume "future versions" are >6.0, but we don't really know
 is_future_version := \
-        $(shell ( test $(PLATFORM_VERSION_MAJ) -ge 5 ) && echo 1 || echo 0)
+        $(shell ( test $(PLATFORM_RELEASE_MAJ) -gt 6 || \
+                                ( test $(PLATFORM_RELEASE_MAJ) -eq 6 && \
+                                  test $(PLATFORM_RELEASE_MIN) -gt 0 ) ) && echo 1 || echo 0)
 
 # Picking an exact match of API_LEVEL for the platform we're building
 # against can avoid compatibility theming and affords better integration.
 #
 ifeq ($(is_future_version),1)
-API_LEVEL := 20
+API_LEVEL := 23
+else ifeq ($(is_at_least_marshmallow),1)
+API_LEVEL := 23
+else ifeq ($(is_at_least_lollipop_mr1),1)
+API_LEVEL := 22
+else ifeq ($(is_at_least_lollipop),1)
+API_LEVEL := 21
+#API_LEVEL := 20 was l-preview
 else ifeq ($(is_at_least_kitkat),1)
 API_LEVEL := 19
-else ifeq ($(is_at_least_jellybean_mr2),1)
-API_LEVEL := 18
-else ifeq ($(is_at_least_jellybean_mr1),1)
-API_LEVEL := 17
-else ifeq ($(is_at_least_jellybean),1)
-API_LEVEL := 16
 else
-$(error Must build against Android >= 4.1)
+$(error Must build against Android >= 4.4)
 endif
 
 # Each DDK is tested against only a single version of the platform.
@@ -134,6 +156,6 @@ endif
 #
 ifeq ($(is_future_version),1)
 $(info WARNING: Android version is newer than this DDK supports)
-else ifneq ($(is_at_least_jellybean_mr2),1)
+else ifneq ($(is_at_least_lollipop_mr1),1)
 $(info WARNING: Android version is older than this DDK supports)
 endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/apis/xorg.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/apis/xorg.mk
index c779e9d..cdcabd9 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/apis/xorg.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/apis/xorg.mk
@@ -39,9 +39,17 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-ifeq ($(filter xorg,$(EXCLUDED_APIS)),)
- COMPONENTS += xorg pvr_conf pvr_video wsegl_dri2_linux
- -include ../common/apis/xorg_opengl.mk
+ifeq ($(WINDOW_SYSTEM),xorg)
+ SUPPORT_BUILD_LWS := 1
+ COMPONENTS += libudev_stubs
+ ifeq ($(PVR_LWS_NODC),1)
+  COMPONENTS += xorg pvr_conf pvr_video lws_pkgconfig pvr_dri
+ else
+  COMPONENTS += xorg pvr_conf pvr_video wsegl_dri2_linux
+  ifeq ($(filter opengl,$(EXCLUDED_APIS)),)
+   COMPONENTS += pvr_dri
+  endif
+ endif
 ifeq ($(SUPPORT_PVR_REMOTE),1)
  COMPONENTS += pvr_input
 endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk
index 4097e7a..b6f945f 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/dridrm.mk
@@ -59,3 +59,20 @@ $(eval $(call TunableBothConfigMake,PVR_DRI_DRM_NOT_PCI))
 
 $(eval $(call TunableKernelConfigC,PVR_DRI_DRM_PLATFORM_DEV,))
 
+
+
+ifeq ($(SUPPORT_DRI_DRM_PLUGIN),1)
+PVR_DRI_CLIENT_DRIVER := pvrsrvkm
+else
+# The X and Wayland window systems derive the client driver name from a
+# display driver DRM device node. The Surfaceless window system derives it
+# from a render node.
+ifeq ($(WINDOW_SYSTEM),surfaceless)
+PVR_DRI_CLIENT_DRIVER := pvr
+else
+PVR_DRI_CLIENT_DRIVER := $(if $(PVR_DRM_MODESET_DRIVER_NAME),$(PVR_DRM_MODESET_DRIVER_NAME),pvr)
+endif
+endif
+
+PVR_DRI_GET_EXTENSIONS_ENTRY_POINT := __driDriverGetExtensions_$(PVR_DRI_CLIENT_DRIVER)
+
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg.mk
index 27c77a3..6867263 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg.mk
@@ -38,11 +38,17 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-PVR_SECURE_DRM_AUTH_EXPORT := 1
+ifeq ($(PVR_DRM_MODESET_DRIVER_NAME),)
+ PVR_SECURE_DRM_AUTH_EXPORT := 1
+endif
 
 $(eval $(call TunableKernelConfigC,XPROC_WORKAROUND_NUM_SHAREABLES,4095))
 
 ifeq ($(SUPPORT_PVR_REMOTE),1)
 else
+ ifeq ($(PVR_LWS_NODC),1)
+ else
+ endif
 endif
 
+
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg_test.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg_test.mk
index fe10742..ea112e7 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg_test.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/xorg_test.mk
@@ -38,14 +38,21 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-# FIXME: Will go away when SUPPORT_DRI_DRM is untangled from
-#        the old meaning of SUPPORT_XORG=1.
-
-ifeq ($(filter xorg,$(EXCLUDED_APIS)),)
-ifneq ($(wildcard ../common/apis/xorg.mk),)
-SUPPORT_BUILD_XORG := 1
-ifeq ($(PDUMP),1)
-SUPPORT_PDUMP_MULTI_PROCESS := 1
-endif
+ifeq ($(WINDOW_SYSTEM),)
+ ifeq ($(filter xorg,$(EXCLUDED_APIS)),)
+  ifneq ($(wildcard ../common/apis/xorg.mk),)
+   WINDOW_SYSTEM := xorg
+   WINDOW_SYSTEM_SET_INTERNALLY := 1
+  endif
+ endif
 endif
+
+ifeq ($(WINDOW_SYSTEM),xorg)
+ # Set for the benefit of those platform Makefiles that test for it,
+ # but no longer used by the build system.
+ SUPPORT_BUILD_XORG := 1
+
+ ifeq ($(PDUMP),1)
+  SUPPORT_PDUMP_MULTI_PROCESS := 1
+ endif
 endif
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk
index 1bfce01..5cd7a47 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/config/core.mk
@@ -178,7 +178,11 @@ $(call directory-must-exist,$(TOP)/eurasiacon/build/linux2/$(PVR_BUILD_DIR))
 # final programs/libraries, and install/rc scripts.
 #
 BUILD   ?= release
-OUT             ?= $(TOP)/eurasiacon/binary2_$(PVR_BUILD_DIR)_$(BUILD)
+ifneq ($(WINDOW_SYSTEM),)
+OUT ?= $(TOP)/eurasiacon/binary_$(PVR_BUILD_DIR)_$(WINDOW_SYSTEM)_$(BUILD)
+else
+OUT ?= $(TOP)/eurasiacon/binary2_$(PVR_BUILD_DIR)_$(BUILD)
+endif
 override OUT := $(if $(filter /%,$(OUT)),$(OUT),$(TOP)/$(OUT))
 
 CONFIG_MK                       := $(OUT)/config.mk
@@ -269,7 +273,9 @@ ifeq ($(SUPPORT_LINUX_USING_WORKQUEUES),1)
 override PVR_LINUX_USING_WORKQUEUES := 1
 override PVR_LINUX_MISR_USING_PRIVATE_WORKQUEUE := 1
 override PVR_LINUX_TIMERS_USING_WORKQUEUES := 1
+ifneq ($(SUPPORT_ANDROID_FPGA),1)
 override SYS_CUSTOM_POWERLOCK_WRAP := 1
+endif
 else ifeq ($(SUPPORT_LINUX_USING_SHARED_WORKQUEUES),1)
 override PVR_LINUX_USING_WORKQUEUES := 1
 override PVR_LINUX_MISR_USING_WORKQUEUE := 1
@@ -360,7 +366,7 @@ $$(warning *** Setting $(1) via $$(origin $(1)) is deprecated)
 $$(error If you are trying to disable a component, use e.g. EXCLUDED_APIS="opengles1 opengl")
 endif
 endef
-$(foreach _o,SYS_CFLAGS SYS_CXXFLAGS SYS_INCLUDES SYS_EXE_LDFLAGS SYS_LIB_LDFLAGS SYS_EXE_LDFLAGS_CXX SYS_LIB_LDFLAGS_CXX SUPPORT_EWS SUPPORT_OPENGLES1 SUPPORT_OPENGLES2 SUPPORT_OPENCL SUPPORT_RSCOMPUTE SUPPORT_OPENGL SUPPORT_UNITTESTS SUPPORT_XORG,$(eval $(call sanity-check-support-option-origin,$(_o))))
+$(foreach _o,SYS_CFLAGS SYS_CXXFLAGS SYS_INCLUDES SYS_COMMON_LDFLAGS SYS_EXE_LDFLAGS SYS_LIB_LDFLAGS SYS_EXE_LDFLAGS_CXX SYS_LIB_LDFLAGS_CXX SUPPORT_EWS SUPPORT_OPENGLES1 SUPPORT_OPENGLES2 SUPPORT_OPENCL SUPPORT_RSCOMPUTE SUPPORT_OPENGL SUPPORT_UNITTESTS SUPPORT_XORG,$(eval $(call sanity-check-support-option-origin,$(_o))))
 
 # Check for words in EXCLUDED_APIS that aren't understood by the
 # common/apis/*.mk files. This should be kept in sync with all the tests on
@@ -401,6 +407,31 @@ COMPONENTS += pvrvncsrv
 COMPONENTS += pvrvncinput
 endif
 
+ifeq ($(HAVE_WINDOW_SYSTEM_MAKEFILE),)
+  ifeq ($(WINDOW_SYSTEM_SET_INTERNALLY),)
+   ifneq ($(WINDOW_SYSTEM),)
+    $(error "The WINDOW_SYSTEM build variable is not supported on this platform")
+   endif
+  endif
+  ifneq ($(MESA_EGL),)
+   $(error "The MESA_EGL build variable is not supported on this platform")
+  endif
+  PVR_LWS_NODC :=
+  PVR_LWS_NOBC :=
+endif
+
+ifneq ($(WINDOW_SYSTEM),)
+endif
+ifeq ($(MESA_EGL),1)
+ SUPPORT_OPENGLES1_V1_ONLY := 1
+ GLES1_EXTENSION_EGL_IMAGE_EXTERNAL := 1
+ GLES2_EXTENSION_EGL_IMAGE_EXTERNAL := 1
+else
+ ifeq ($(SUPPORT_BUILD_LWS),1)
+ else
+ endif
+endif
+
 $(if $(filter config,$(D)),$(info Build configuration:))
 
 ################################# CONFIG ####################################
@@ -426,7 +457,7 @@ $(eval $(call TunableBothConfigMake,KERNEL_CROSS_COMPILE,))
 endif
 
 # Check the KERNELDIR has a kernel built.
-VMLINUX := $(strip $(wildcard $(KERNELDIR)/vmlinux))
+VMLINUX := 
 LINUXCFG := $(strip $(wildcard $(KERNELDIR)/.config))
 
 ifneq ($(VMLINUX),)
@@ -437,8 +468,10 @@ VMLINUX_IS_64BIT := $(shell file $(VMLINUX) | grep 64-bit >/dev/null || echo fal
 VMLINUX_HAS_PAE36 := $(shell cat $(LINUXCFG) | grep CONFIG_X86_PAE=y >/dev/null || echo false)
 VMLINUX_HAS_PAE40 := $(shell cat $(LINUXCFG) | grep CONFIG_ARM_LPAE=y >/dev/null || echo false)
 VMLINUX_HAS_DMA32 := $(shell cat $(LINUXCFG) | grep CONFIG_ZONE_DMA32=y >/dev/null || echo false)
+VMLINUX_HAS_DMA := $(shell cat $(LINUXCFG) | grep CONFIG_ZONE_DMA=y >/dev/null || echo false)
 
-# $(error 64BIT=$(VMLINUX_IS_64BIT) PAE36=$(VMLINUX_HAS_PAE36) PAE40=$(VMLINUX_HAS_PAE40) DMA32=$(VMLINUX_HAS_DMA32) MMU36=$(SGX_FEATURE_36BIT_MMU))
+
+# $(error 64BIT=$(VMLINUX_IS_64BIT) PAE36=$(VMLINUX_HAS_PAE36) PAE40=$(VMLINUX_HAS_PAE40) DMA=$(VMLINUX_HAS_DMA) DMA32=$(VMLINUX_HAS_DMA32) MMU36=$(SGX_FEATURE_36BIT_MMU))
 
 ifneq ($(VMLINUX_IS_64BIT),false)
 $(warning $$(KERNELDIR)/vmlinux: Note: vmlinux is 64-bit, which is supported but currently experimental.)
@@ -449,8 +482,8 @@ endif
 endif
 
 ifneq ($(VMLINUX_HAS_PAE40),false)
-ifeq ($(VMLINUX_HAS_DMA32),false)
-$(warning SGX MMUs are currently supported up to only 36 bits max. Your Kernel is built with 40-bit PAE but does not have CONFIG_ZONE_DMA32.)
+ifeq ($(VMLINUX_HAS_DMA),false)
+$(warning SGX MMUs are currently supported up to only 36 bits max. Your Kernel is built with 40-bit PAE but does not have CONFIG_ZONE_DMA.)
 $(warning This means you must ensure the runtime system has <= 4GB of RAM, or there will be BIG problems...)
 endif 
 endif
@@ -465,8 +498,8 @@ endif
 else
  # Kernel is 32-bit
 ifneq ($(VMLINUX_HAS_PAE36),false)
-ifeq ($(VMLINUX_HAS_DMA32),false)
-$(warning SGX is configured with 32-bit MMU. Your Kernel is 32-bit PAE, but does not have CONFIG_ZONE_DMA32. )
+ifeq ($(VMLINUX_HAS_DMA),false)
+$(warning SGX is configured with 32-bit MMU. Your Kernel is 32-bit PAE, but does not have CONFIG_ZONE_DMA. )
 $(warning This means you must ensure the runtime system has <= 4GB of RAM, or there will be BIG problems...)
 endif
 endif
@@ -506,13 +539,16 @@ ifneq ($(DISPLAY_CONTROLLER),)
 $(eval $(call BothConfigC,DISPLAY_CONTROLLER,$(DISPLAY_CONTROLLER)))
 endif
 
+ifneq ($(DRM_DISPLAY_CONTROLLER),)
+endif
+
 ifneq ($(strip $(KERNELDIR)),)
 PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0
 ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0)
 PVR_LINUX_MEM_AREA_USE_VMAP ?= 1
 include ../kernel_version.mk
 ifeq ($(call kernel-version-at-least,3,0),true)
-PVR_LINUX_MEM_AREA_POOL_ALLOW_SHRINK ?= 0
+PVR_LINUX_MEM_AREA_POOL_ALLOW_SHRINK ?= 1
 endif
 endif
 $(eval $(call KernelConfigC,PVR_LINUX_MEM_AREA_POOL_MAX_PAGES,$(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES)))
@@ -537,6 +573,7 @@ $(eval $(call KernelConfigC,DEBUG_BRIDGE_KM,))
 else ifeq ($(BUILD),release)
 $(eval $(call BothConfigC,RELEASE,))
 $(eval $(call TunableBothConfigMake,DEBUGLINK,1))
+$(eval $(call TunableBothConfigC,PVR_DBGPRIV_LEVEL,))
 else ifeq ($(BUILD),timing)
 $(eval $(call BothConfigC,TIMING,))
 $(eval $(call TunableBothConfigMake,DEBUGLINK,1))
@@ -566,6 +603,7 @@ $(eval $(call TunableBothConfigC,SGX_FEATURE_MP_PLUS,))
 $(eval $(call TunableBothConfigC,FPGA,))
 $(eval $(call TunableBothConfigC,PDUMP,))
 $(eval $(call TunableBothConfigC,MEM_TRACK_INFO_DEBUG,))
+$(eval $(call TunableBothConfigC,PVRSRV_DEVMEM_TIME_STATS,))
 $(eval $(call TunableBothConfigC,NO_HARDWARE,))
 $(eval $(call TunableBothConfigC,PDUMP_DEBUG_OUTFILES,))
 $(eval $(call TunableBothConfigC,PVRSRV_USSE_EDM_STATUS_DEBUG,))
@@ -578,7 +616,7 @@ $(eval $(call TunableBothConfigC,PVRSRV_NEED_PVR_ASSERT,))
 $(eval $(call TunableBothConfigC,PVRSRV_NEED_PVR_TRACE,))
 $(eval $(call TunableBothConfigC,SUPPORT_SECURE_33657_FIX,))
 $(eval $(call TunableBothConfigC,SUPPORT_ION,))
-$(eval $(call TunableBothConfigC,SUPPORT_DRM_GEM,))
+$(eval $(call TunableBothConfigC,SUPPORT_DMABUF,))
 $(eval $(call TunableBothConfigC,SUPPORT_HWRECOVERY_TRACE_LIMIT,))
 $(eval $(call TunableBothConfigC,SUPPORT_PVRSRV_DEVICE_CLASS,))
 $(eval $(call TunableBothConfigC,SUPPORT_PVRSRV_GET_DC_SYSTEM_BUFFER,1))
@@ -599,6 +637,7 @@ $(eval $(call TunableKernelConfigC,PVR_LINUX_MISR_USING_PRIVATE_WORKQUEUE,))
 $(eval $(call TunableKernelConfigC,PVR_LINUX_TIMERS_USING_WORKQUEUES,))
 $(eval $(call TunableKernelConfigC,PVR_LINUX_TIMERS_USING_SHARED_WORKQUEUE,))
 $(eval $(call TunableKernelConfigC,LDM_PLATFORM,))
+$(eval $(call TunableKernelConfigC,PVR_LDM_DEVICE_TREE,))
 $(eval $(call TunableKernelConfigC,PVR_LDM_PLATFORM_PRE_REGISTERED,))
 $(eval $(call TunableKernelConfigC,PVR_LDM_PLATFORM_PRE_REGISTERED_DEV,))
 $(eval $(call TunableKernelConfigC,PVR_LDM_DRIVER_REGISTRATION_NAME,"\"$(PVRSRV_MODNAME)\""))
@@ -620,7 +659,7 @@ $(eval $(call TunableKernelConfigC,SUPPORT_FORCE_SYNC_DUMP,))
 
 $(eval $(call TunableBothConfigMake,OPTIM,))
 $(eval $(call TunableBothConfigMake,SUPPORT_ION,))
-$(eval $(call TunableBothConfigMake,SUPPORT_DRM_GEM,))
+$(eval $(call TunableBothConfigMake,SUPPORT_DMABUF,))
 $(eval $(call TunableBothConfigMake,SUPPORT_PVRSRV_DEVICE_CLASS,))
 
 
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk
index dee740f..311bbb0 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/defs.mk
@@ -146,3 +146,8 @@ endef
 define module-info-line
 $(if $(filter modules,$(D)),$(info $(1)),)
 endef
+
+# $(call if-exists,A,B) => A if A is a file which exists, otherwise B
+define if-exists
+$(if $(wildcard $(1)),$(1),$(2))
+endef
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs.mk
index ef4596c..155d3bb 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/moduledefs.mk
@@ -61,12 +61,12 @@ endif
 
 # Only allow cflags that do not affect code generation. This is to ensure
 # proper binary compatibility when LTO (Link-Time Optimization) is enabled.
-# We make exceptions for -fPIC, -fPIE and -m32 which will all fail linkage
-# in non-LTO mode if incorrectly specified.
+# We make exceptions for the below flags which will all fail linkage in
+# non-LTO mode if incorrectly specified.
 #
 # NOTE: Only used by static_library and objects right now. Other module
 # types should not be affected by complex code generation flags w/ LTO.
-MODULE_ALLOWED_CFLAGS := -W% -D% -std=% -fPIC -fPIE -m32
+MODULE_ALLOWED_CFLAGS := -W% -D% -std=% -fPIC -fPIE -pie -m32
 
 # -L flags for library search dirs: these are relative to $(TOP), unless
 # they're absolute paths
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/modules.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/modules.mk
index 1576590..971f21a 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/modules.mk
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/modules.mk
@@ -42,7 +42,6 @@
 # Bits for processing $(modules) after reading in each Linux.mk
 
 #$(info ---- $(modules) ----)
-$(call must-be-nonempty,modules)
 
 $(foreach _m,$(modules),$(if $(filter $(_m),$(ALL_MODULES)),$(error In makefile $(THIS_MAKEFILE): Duplicate module $(_m) (first seen in $(INTERNAL_MAKEFILE_FOR_MODULE_$(_m))) listed in $$(modules)),$(eval $(call register-module,$(_m)))))
 
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
index 109e405..03efcdb 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_android/Makefile
@@ -63,7 +63,21 @@ SGXCORE						:= 544
 SGX_CORE_REV                            := 112
 HAL_VARIANT                                     := omap4
 endif
-ifneq ($(filter jacinto6evm omap5sevm panda5,$(TARGET_DEVICE)),)
+ifneq ($(filter omap5sevm panda5,$(TARGET_DEVICE)),)
+SGXCORE                                         := 544
+SGX_CORE_REV                            := 105
+SGX_FEATURE_MP                          := 1
+SGX_FEATURE_SYSTEM_CACHE        := 1
+SGX_FEATURE_MP_CORE_COUNT       := 2
+HAL_VARIANT                                     := omap5
+
+# OMAP Product Version
+VS_PRODUCT_VERSION                      := 5
+
+# FIXME: Re-enable this ASAP
+SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
+endif
+ifneq ($(filter jacinto6evm,$(TARGET_DEVICE)),)
 SGXCORE                                         := 544
 SGX_CORE_REV                            := 116
 SGX_FEATURE_MP                          := 1
@@ -72,10 +86,12 @@ SGX_FEATURE_MP_CORE_COUNT	:= 2
 HAL_VARIANT                                     := jacinto6
 
 # OMAP Product Version
+# FIXME: Get rid of this
 VS_PRODUCT_VERSION                      := 5
 
 # FIXME: Re-enable this ASAP
 SUPPORT_ACTIVE_POWER_MANAGEMENT := 0
+
 endif
 
 # Handle any TARGET_DEVICE remapping. Not all DDK TARGET_DEVICEs
@@ -92,15 +108,19 @@ SGX_DYNAMIC_TIMING_INFO := 1
 
 SUPPORT_LINUX_USING_WORKQUEUES := 1
 
-SUPPORT_PVRSRV_ANDROID_SYSTRACE := 0
+SUPPORT_PVRSRV_ANDROID_SYSTRACE := 1
 
-ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
+SUPPORT_DMABUF := 1
+
+# TODO: Set SUPPORT_PVRSVR_DEVICE_CLASS to 0
+#DISPLAY_CONTROLLER should not be used for DRM based display controller
+#ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
 #DISPLAY_CONTROLLER := omaplfb
-endif
+#endif
 
 PVR_SYSTEM := omap
 
-KERNEL_CROSS_COMPILE ?= arm-none-linux-gnueabi-
+KERNEL_CROSS_COMPILE ?= arm-eabi-
 
 # We have more memory on OMAP platforms, so we can spare to make the
 # pool larger, and have higher resolutions which benefit from it.
@@ -126,6 +146,9 @@ ifneq ($(strip $(KERNELDIR)),)
   SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED := 1
   SYS_OMAP_HAS_DVFS_FRAMEWORK := 0
  endif
+ ifeq ($(call kernel-version-at-least,3,8,13),true)
+  PVR_LDM_DEVICE_TREE := 1
+ endif
 else
  $(warning "KERNELDIR is not set, so can't feature check DVFS or dsscomp.")
  $(warning "Assuming we want DVFS and dsscomp support.")
@@ -143,6 +166,7 @@ DISPLAY_CONTROLLER_COMPONENT := linux_framebuffer
 OMAP_NON_FLIP_DISPLAY := 1
 endif
 else # LDM_PLATFORM != 1
+# TODO: we should set DEVICE_CLASS to zero
 ifneq ($(SUPPORT_PVRSRV_DEVICE_CLASS),0)
 #DISPLAY_CONTROLLER_COMPONENT := dc_omapfb3_linux
 endif
@@ -176,7 +200,7 @@ SUPPORT_ANDROID_OMAP_NV12 := 1
 
 PVR_ANDROID_USE_WINDOW_TRANSFORM_HINT := 1
 
-PVR_ANDROID_PLATFORM_HAS_LINUX_FBDEV := 0
+PVR_ANDROID_PLATFORM_HAS_LINUX_FBDEV := 1
 
 # Handle Google's OMAP-based products
 #
@@ -200,6 +224,9 @@ endif
 endif # SUPPORT_DC_CMDCOMPLETE_WHEN_NO_LONGER_DISPLAYED == 1
 endif # NO_HARDWARE == 1
 
+# we are not using PVR composerhal
+#PVR_ANDROID_COMPOSERHAL ?= omap
+
 include ../config/core.mk
 include ../common/android/extra_config.mk
 include ../common/dridrm.mk
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile
index 8a65e7d..6c9b932 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/omap_linux/Makefile
@@ -39,56 +39,69 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ### ###########################################################################
 
-# If a product wasn't specified, we're an OMAP4430 blaze.
+include ../kernel_version.mk
+ifeq ($(call kernel-version-at-least,3,8,13),true)
+ SUPPORT_LWS_WITH_DC ?= 0
+endif
+include ../config/window_system.mk
+
+# If a product wasn't specified, we're a J6 EVM.
 #
 TARGET_PRODUCT ?= jacinto6evm
 
+PVRSRV_NEED_PVR_DPF := 1
+PVRSRV_NEW_PVR_DPF := 1
+
 # Customize this build as per the TARGET_PRODUCT setting
 #
 ifneq ($(filter blaze blaze_tablet panda,$(TARGET_PRODUCT)),)
-SGXCORE                                 := 540
-SGX_CORE_REV                            := 120
+ SGXCORE                                        := 540
+ SGX_CORE_REV                           := 120
 endif
 ifneq ($(filter blaze.4470 blaze_tablet.4470,$(TARGET_PRODUCT)),)
-SGXCORE                                 := 544
-SGX_CORE_REV                            := 112
+ SGXCORE                                        := 544
+ SGX_CORE_REV                           := 112
 endif
 ifneq ($(filter omap5sevm panda5,$(TARGET_PRODUCT)),)
-SGXCORE                                 := 544
-SGX_CORE_REV                            := 105
-SGX_FEATURE_MP                          := 1
-SGX_FEATURE_SYSTEM_CACHE                := 1
-SGX_FEATURE_MP_CORE_COUNT               := 2
-PVR_OMAPLFB_DRM_FB                      := 0
-SYS_OMAP_HAS_DVFS_FRAMEWORK             := 1
-
-# OMAP Product Version
-VS_PRODUCT_VERSION                      := 5
-
-# FIXME: Re-enable this ASAP
-SUPPORT_ACTIVE_POWER_MANAGEMENT         := 0
+ SGXCORE                                        := 544
+ SGX_CORE_REV                           := 105
+ SGX_FEATURE_MP                         := 1
+ SGX_FEATURE_SYSTEM_CACHE               := 1
+ SGX_FEATURE_MP_CORE_COUNT              := 2
+ PVR_OMAPLFB_DRM_FB                     := 0
+ SYS_OMAP_HAS_DVFS_FRAMEWORK            := 1
+
+ # OMAP Product Version
+ VS_PRODUCT_VERSION                     := 5
+
+ # FIXME: Re-enable this ASAP
+ SUPPORT_ACTIVE_POWER_MANAGEMENT        := 0
 endif
 ifneq ($(filter jacinto6evm omap5uevm,$(TARGET_PRODUCT)),)
-SGXCORE                                 := 544
-SGX_CORE_REV                            := 116
-SGX_FEATURE_MP                          := 1
-SGX_FEATURE_SYSTEM_CACHE                := 1
-SGX_FEATURE_MP_CORE_COUNT               := 2
+ SGXCORE                                        := 544
+ SGX_CORE_REV                           := 116
+ SGX_FEATURE_MP                         := 1
+ SGX_FEATURE_SYSTEM_CACHE               := 1
+ SGX_FEATURE_MP_CORE_COUNT              := 2
+ SYS_OMAP_HAS_DVFS_FRAMEWORK            := 1
 
-SYS_OMAP5_UEVM                          := 1
+ SYS_OMAP5_UEVM                         := 1
 
-# OMAP Product Version
-VS_PRODUCT_VERSION                      := 5
+ # OMAP Product Version
+ VS_PRODUCT_VERSION                     := 5
 endif
 
+PVR_NO_OMAP_TIMER := 1
+
 PVR_SYSTEM              := omap
 
-KERNEL_COMPONENTS := srvkm bufferclass_example
+KERNEL_COMPONENTS := srvkm
+ifeq ($(PVR_LWS_NOBC),)
+KERNEL_COMPONENTS += bufferclass_example
+endif
 
 SUPPORT_OLD_ION_API := 1
 
-include ../kernel_version.mk
-
 # Only enable active power management if passive power management is
 # enabled, as indicated by LDM_PLATFORM being set to 1.  On OMAP,
 # the system can suspend in the case where active power management is
@@ -99,8 +112,9 @@ LDM_PLATFORM ?= 1
 
 ifeq ($(LDM_PLATFORM),1)
 SUPPORT_LINUX_USING_WORKQUEUES := 1
-DISPLAY_CONTROLLER_COMPONENT += dc_omapfb3_linux
-DISPLAY_CONTROLLER := omaplfb
+#With DRM EGL and display, omaplfb is not needed
+#DISPLAY_CONTROLLER_COMPONENT += dc_omapfb3_linux
+#DISPLAY_CONTROLLER := omaplfb
 else
 SUPPORT_LINUX_USING_SHARED_WORKQUEUES := 1
 OMAP_NON_FLIP_DISPLAY := 1
@@ -142,16 +156,25 @@ SYS_CUSTOM_POWERLOCK_WRAP := 1
 
 ifeq ($(OMAP_NON_FLIP_DISPLAY),1)
 OPK_DEFAULT := libpvrPVR2D_BLITWSEGL.so
-else
-OPK_DEFAULT := libpvrPVR2D_FLIPWSEGL.so
 endif
 
 ifeq ($(SYS_OMAP5_UEVM),1)
+XORG_EXPLICIT_PVR_SERVICES_LOAD := 1
+ifeq ($(call kernel-version-at-least,3,8,13),true)
+LDM_PLATFORM := 1
+PVR_LDM_DEVICE_TREE := 1
+else
 PVR_LDM_PLATFORM_PRE_REGISTERED := 1
 PVR_LDM_PLATFORM_PRE_REGISTERED_DEV := "\"omapdrm_pvr\""
-XORG_EXPLICIT_PVR_SERVICES_LOAD := 1
+endif
+ifeq ($(PVR_LWS_NODC),1)
+# No display class driver.
+DISPLAY_CONTROLLER_COMPONENT :=
+DISPLAY_CONTROLLER :=
+else
 PVR_OMAPLFB_DRM_FB := 0
 PVR_OMAPLFB_DONT_USE_FB_PAN_DISPLAY := 1
+endif
 else
 ifeq ($(call kernel-version-at-least,2,6,35),true)
 # Work around flipping problems seen with the Taal LCDs on Blaze.
@@ -182,16 +205,17 @@ endif
 endif
 endif
 
-include ../common/xorg_test.mk
-ifeq ($(SUPPORT_BUILD_XORG),1)
-SUPPORT_DRI_DRM := 1
-endif
-
 ifeq ($(SUPPORT_DRI_DRM),1)
 ifeq ($(SYS_OMAP5_UEVM),1)
 PVR_DRI_DRM_PLATFORM_DEV := 1
+ifneq ($(call kernel-version-at-least,3,8,13),true)
 PVR_DRI_DRM_STATIC_BUS_ID := 1
 PVR_DRI_DRM_DEV_BUS_ID := "\"platform:omapdrm_pvr:00"\"
+endif
+ifeq ($(PVR_LWS_NODC),1)
+PVR_DRM_MODESET_DRIVER_NAME := omapdrm
+PVR_DRM_MODESET_MODULE_NAME := dumb
+endif
 else
 ifeq ($(call kernel-version-at-least,2,6,35),true)
 PVR_DRI_DRM_PLATFORM_DEV := 1
@@ -212,6 +236,9 @@ endif	# kernel-version-at-least,2,6,35
 endif   # ($(SYS_OMAP5_UEVM),1)
 endif   # SUPPORT_DRI_DRM
 
+include ../common/xorg_test.mk
+
+ifeq ($(PVR_LWS_NODC),)
 ifeq ($(SUPPORT_BUILD_XORG),1)
 ifeq ($(call kernel-version-at-least,2,6,35,7),true)
 # A client DRI authorisation failure, whilst switched away from the X Server
@@ -222,16 +249,9 @@ PVR_XORG_DONT_DROP_MASTER_IN_LEAVE_VT := 1
 endif
 XORG_PVR_VIDEO ?= omap4
 
-OPK_FALLBACK := libpvrPVR2D_DRIWSEGL.so
-
 ifneq ($(OMAP_NON_FLIP_DISPLAY),1)
 PVR_DISPLAY_CONTROLLER_DRM_IOCTL := 1
 endif
-
-else  # xorg isn't excluded
-
-OPK_FALLBACK := libpvrPVR2D_BLITWSEGL.so
-
 endif # xorg isn't excluded
 
 ifeq ($(SUPPORT_DRI_DRM),1)
@@ -243,6 +263,7 @@ EXTRA_PVRSRVKM_COMPONENTS += $(DISPLAY_CONTROLLER_COMPONENT)
 else
 KERNEL_COMPONENTS += $(DISPLAY_CONTROLLER_COMPONENT)
 endif
+endif
 
 include ../config/core.mk
 include ../common/xorg.mk
diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/sunxi_android/Makefile b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/sunxi_android/Makefile
index 4473d62..9313a1b 100644
--- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/sunxi_android/Makefile
+++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/sunxi_android/Makefile
@@ -76,7 +76,7 @@ PVRSRV_DUMP_MK_TRACE ?= 1
 
 SUPPORT_ANDROID_SUNXI ?= 1
 
-ION_DEFAULT_HEAP_MASK := ION_HEAP_CARVEOUT_MASK
+ION_DEFAULT_HEAP_ID_MASK := ION_HEAP_CARVEOUT_MASK
 
 # We have more memory on the sun6i platform, so we can spare to make
 # the pool larger, and have higher resolutions which benefit from it.
@@ -108,6 +108,8 @@ KERNEL_COMPONENTS += dc_nohw
 endif
 endif
 
+PVR_ANDROID_COMPOSERHAL ?= sunxi
+
 include ../config/core.mk
 include ../common/android/extra_config.mk
 include ../common/opencl.mk