From ec9396f72c8787bdf2c843428dd47236b82b26ce Mon Sep 17 00:00:00 2001
From: Ziyan <jaraidaniel@gmail.com>
Date: Sat, 10 Jan 2015 01:21:44 +0100
Subject: tuna: cleanup domx defines

---
 BoardConfig.mk | 68 +++++++---------------------------------------------------
 1 file changed, 8 insertions(+), 60 deletions(-)

(limited to 'BoardConfig.mk')

diff --git a/BoardConfig.mk b/BoardConfig.mk
index fb54493..1be9630 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,15 +19,6 @@ DEVICE_FOLDER := device/samsung/tuna
 # CMHW
 BOARD_HARDWARE_CLASS := $(DEVICE_FOLDER)/cmhw
 
-# TI Enhancement Settings (Part 1)
-#OMAP_ENHANCEMENT := true
-#OMAP_ENHANCEMENT_BURST_CAPTURE := true
-#OMAP_ENHANCEMENT_S3D := true
-#OMAP_ENHANCEMENT_CPCAM := true
-#OMAP_ENHANCEMENT_VTC := true
-#OMAP_ENHANCEMENT_MULTIGPU := true
-BOARD_USE_TI_ENHANCED_DOMX := true
-
 PRODUCT_VENDOR_KERNEL_HEADERS := $(DEVICE_FOLDER)/kernel-headers
 
 TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_FOLDER)/include
@@ -35,16 +26,6 @@ TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_FOLDER)/include
 # Setup custom omap4xxx defines
 BOARD_USE_CUSTOM_LIBION := true
 
-# Camera
-#TI_OMAP4_CAMERAHAL_VARIANT := true
-#TI_CAMERAHAL_USES_LEGACY_DOMX_DCC := true
-#TI_CAMERAHAL_MAX_CAMERAS_SUPPORTED := 2
-#TI_CAMERAHAL_TREAT_FRONT_AS_BACK := true
-#TI_CAMERAHAL_DEBUG_ENABLED := true
-#TI_CAMERAHAL_VERBOSE_DEBUG_ENABLED := true
-#TI_CAMERAHAL_DEBUG_FUNCTION_NAMES := true
-USE_CAMERA_STUB := true
-
 # Use the non-open-source parts, if they're present
 -include vendor/samsung/tuna/BoardConfigVendor.mk
 
@@ -85,47 +66,14 @@ TARGET_KERNEL_MODULES += SGX_MODULES
 
 TARGET_TI_HWC_HDMI_DISABLED := true
 
-# TI Enhancement Settings (Part 2)
-ifdef BOARD_USE_TI_ENHANCED_DOMX
-    BOARD_USE_TI_DUCATI_H264_PROFILE := true
-    # BOARD_USE_TI_DOMX_LOW_SECURE_HEAP := true
-    BOARD_USE_TI_CUSTOM_DOMX := true
-    TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_FOLDER)/domx/omx_core/inc
-    COMMON_GLOBAL_CFLAGS += -DOMAP_TUNA
-    # ENHANCED_DOMX := true
-    TI_CUSTOM_DOMX_PATH := $(DEVICE_FOLDER)/domx
-    DOMX_PATH := $(DEVICE_FOLDER)/domx
-else
-    DOMX_PATH := hardware/ti/omap4xxx/domx
-endif
-
-ifdef OMAP_ENHANCEMENT
-    COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT -DTARGET_OMAP4
-endif
-
-ifdef OMAP_ENHANCEMENT_BURST_CAPTURE
-    COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_BURST_CAPTURE
-endif
-
-ifdef OMAP_ENHANCEMENT_S3D
-    COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_S3D
-endif
-
-ifdef OMAP_ENHANCEMENT_CPCAM
-    COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_CPCAM
-endif
-
-ifdef OMAP_ENHANCEMENT_VTC
-    COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_VTC
-endif
-
-ifdef USE_ITTIAM_AAC
-    COMMON_GLOBAL_CFLAGS += -DUSE_ITTIAM_AAC
-endif
-
-ifdef OMAP_ENHANCEMENT_MULTIGPU
-    COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_MULTIGPU
-endif
+# DOMX
+BOARD_USE_TI_DUCATI_H264_PROFILE := true
+BOARD_USE_TI_CUSTOM_DOMX := true
+TARGET_SPECIFIC_HEADER_PATH += $(DEVICE_FOLDER)/domx/omx_core/inc
+COMMON_GLOBAL_CFLAGS += -DOMAP_TUNA
+OMAP_TUNA := true
+TI_CUSTOM_DOMX_PATH := $(DEVICE_FOLDER)/domx
+DOMX_PATH := $(DEVICE_FOLDER)/domx
 
 # Include HDCP keys
 BOARD_CREATE_TUNA_HDCP_KEYS_SYMLINK := true
-- 
cgit v1.1