diff options
author | Vishal Mahaveer | 2014-07-07 15:50:41 -0500 |
---|---|---|
committer | Vishal Mahaveer | 2014-07-08 11:58:53 -0500 |
commit | 1c778e5ad29b386780764133acad05e5471c6eb2 (patch) | |
tree | cd755db24615ac7e2829b6632670ace83baa9b1b | |
parent | c113be3425ee002fce94ef30d261e10d3784afde (diff) | |
download | device-ti-jacinto6evm-1c778e5ad29b386780764133acad05e5471c6eb2.tar.gz device-ti-jacinto6evm-1c778e5ad29b386780764133acad05e5471c6eb2.tar.xz device-ti-jacinto6evm-1c778e5ad29b386780764133acad05e5471c6eb2.zip |
jacinto6evm: cleanup: remove legacy/unused configurations
Remove unused/legacy configurations from jacinto6evm device
Change-Id: I046e4d1925a92e50096d5a32bc20b605fcc69fe9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-rw-r--r-- | BoardConfig.mk | 24 | ||||
-rw-r--r-- | device.mk | 12 | ||||
-rw-r--r-- | init.jacinto6evmboard.rc | 4 | ||||
-rw-r--r-- | ueventd.jacinto6evmboard.rc | 12 |
4 files changed, 6 insertions, 46 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 991878e..d80b244 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk | |||
@@ -18,12 +18,10 @@ | |||
18 | # by BoardConfigVendor.mk | 18 | # by BoardConfigVendor.mk |
19 | BOARD_USES_GENERIC_AUDIO := true | 19 | BOARD_USES_GENERIC_AUDIO := true |
20 | #USE_CAMERA_STUB := true | 20 | #USE_CAMERA_STUB := true |
21 | #ENHANCED_DOMX := true | ||
22 | OMAP_ENHANCEMENT := true | 21 | OMAP_ENHANCEMENT := true |
23 | 22 | ||
24 | ifdef OMAP_ENHANCEMENT | 23 | ifeq ($(OMAP_ENHANCEMENT),true) |
25 | #OMAP_ENHANCEMENT_CPCAM := true | 24 | COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT |
26 | #OMAP_ENHANCEMENT_S3D := true | ||
27 | # Multi-zone audio (requires ro.com.ti.omap_multizone_audio, see device.mk) | 25 | # Multi-zone audio (requires ro.com.ti.omap_multizone_audio, see device.mk) |
28 | #OMAP_MULTIZONE_AUDIO := true | 26 | #OMAP_MULTIZONE_AUDIO := true |
29 | endif | 27 | endif |
@@ -61,12 +59,9 @@ TARGET_RECOVERY_FSTAB = device/ti/jacinto6evm/fstab.jacinto6evmboard | |||
61 | TARGET_RECOVERY_PIXEL_FORMAT := "RGB565" | 59 | TARGET_RECOVERY_PIXEL_FORMAT := "RGB565" |
62 | TARGET_RELEASETOOLS_EXTENSIONS := device/ti/jacinto6evm | 60 | TARGET_RELEASETOOLS_EXTENSIONS := device/ti/jacinto6evm |
63 | 61 | ||
64 | #TARGET_PROVIDES_INIT_RC := true | ||
65 | #TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true | ||
66 | |||
67 | # Connectivity - Wi-Fi | 62 | # Connectivity - Wi-Fi |
68 | USES_TI_MAC80211 := true | 63 | USES_TI_MAC80211 := true |
69 | ifdef USES_TI_MAC80211 | 64 | ifeq ($(USES_TI_MAC80211),true) |
70 | BOARD_WPA_SUPPLICANT_DRIVER := NL80211 | 65 | BOARD_WPA_SUPPLICANT_DRIVER := NL80211 |
71 | WPA_SUPPLICANT_VERSION := VER_0_8_X_TI | 66 | WPA_SUPPLICANT_VERSION := VER_0_8_X_TI |
72 | BOARD_HOSTAPD_DRIVER := NL80211 | 67 | BOARD_HOSTAPD_DRIVER := NL80211 |
@@ -75,20 +70,7 @@ BOARD_SOFTAP_DEVICE := wl12xx_mac80211 | |||
75 | COMMON_GLOBAL_CFLAGS += -DUSES_TI_MAC80211 | 70 | COMMON_GLOBAL_CFLAGS += -DUSES_TI_MAC80211 |
76 | endif | 71 | endif |
77 | 72 | ||
78 | ifdef OMAP_ENHANCEMENT | ||
79 | COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT -DTARGET_OMAP4 | ||
80 | ifdef OMAP_ENHANCEMENT_S3D | ||
81 | COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_S3D | ||
82 | endif | ||
83 | ifdef OMAP_ENHANCEMENT_CPCAM | ||
84 | COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT_CPCAM | ||
85 | endif | ||
86 | ifeq ($(OMAP_MULTIZONE_AUDIO),true) | 73 | ifeq ($(OMAP_MULTIZONE_AUDIO),true) |
87 | COMMON_GLOBAL_CFLAGS += -DOMAP_MULTIZONE_AUDIO | 74 | COMMON_GLOBAL_CFLAGS += -DOMAP_MULTIZONE_AUDIO |
88 | endif | 75 | endif |
89 | endif | ||
90 | |||
91 | # Common device independent definitions | ||
92 | include device/ti/common-open/BoardConfig.mk | ||
93 | |||
94 | 76 | ||
@@ -105,16 +105,6 @@ PRODUCT_PACKAGES += \ | |||
105 | tinyplay \ | 105 | tinyplay \ |
106 | tinycap | 106 | tinycap |
107 | 107 | ||
108 | PRODUCT_PACKAGES += \ | ||
109 | boardidentity \ | ||
110 | libboardidentity \ | ||
111 | libboard_idJNI \ | ||
112 | Board_id | ||
113 | |||
114 | # MultiDisplay | ||
115 | PRODUCT_PACKAGES += \ | ||
116 | TIMultiDisplay | ||
117 | |||
118 | # Radio | 108 | # Radio |
119 | PRODUCT_PACKAGES += \ | 109 | PRODUCT_PACKAGES += \ |
120 | HelloRadio \ | 110 | HelloRadio \ |
@@ -159,9 +149,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ | |||
159 | $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk) | 149 | $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk) |
160 | $(call inherit-product-if-exists, hardware/ti/omap4xxx/jacinto6.mk) | 150 | $(call inherit-product-if-exists, hardware/ti/omap4xxx/jacinto6.mk) |
161 | $(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) | 151 | $(call inherit-product-if-exists, hardware/ti/wpan/ti-wpan-products.mk) |
162 | $(call inherit-product-if-exists, vendor/ti/omap5sevm/device-vendor.mk) | ||
163 | $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk) | 152 | $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ti-jacinto6-vendor.mk) |
164 | #$(call inherit-product-if-exists, device/ti/common-open/s3d/s3d-products.mk) | ||
165 | $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_jacinto6evm.mk) | 153 | $(call inherit-product-if-exists, device/ti/proprietary-open/jacinto6/ducati-full_jacinto6evm.mk) |
166 | $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk) | 154 | $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk) |
167 | $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk) | 155 | $(call inherit-product-if-exists, device/ti/proprietary-open/wl12xx/wpan/wl12xx-wpan-fw-products.mk) |
diff --git a/init.jacinto6evmboard.rc b/init.jacinto6evmboard.rc index 7209c3f..08f82e7 100644 --- a/init.jacinto6evmboard.rc +++ b/init.jacinto6evmboard.rc | |||
@@ -82,10 +82,6 @@ on fs | |||
82 | # take a wakelock on boot until PM is working | 82 | # take a wakelock on boot until PM is working |
83 | write /sys/power/wake_lock hack | 83 | write /sys/power/wake_lock hack |
84 | 84 | ||
85 | # change permissions for Tiler driver | ||
86 | chmod 0777 /dev/tiler | ||
87 | chmod 0777 /dev/dmm | ||
88 | |||
89 | # change permissions for ION driver | 85 | # change permissions for ION driver |
90 | chmod 0777 /dev/ion | 86 | chmod 0777 /dev/ion |
91 | 87 | ||
diff --git a/ueventd.jacinto6evmboard.rc b/ueventd.jacinto6evmboard.rc index 2fb6f3a..55a9f95 100644 --- a/ueventd.jacinto6evmboard.rc +++ b/ueventd.jacinto6evmboard.rc | |||
@@ -3,29 +3,23 @@ | |||
3 | 3 | ||
4 | #for DSSCOMP | 4 | #for DSSCOMP |
5 | /dev/dsscomp 0666 system system | 5 | /dev/dsscomp 0666 system system |
6 | /dev/tiler 0666 system system | ||
7 | 6 | ||
8 | # for IPC3.x | 7 | # for IPC3.x |
9 | /dev/rpmsg-dce 0660 media media | 8 | /dev/rpmsg-dce 0660 media media |
10 | 9 | ||
11 | #for SYSLINK | ||
12 | /dev/rpmsg-omx0 0660 drmrpc drmrpc | ||
13 | /dev/rpmsg-omx1 0660 drmrpc drmrpc | ||
14 | /dev/rproc_user 0660 drmrpc drmrpc | ||
15 | /dev/tf_driver 0660 drmrpc drmrpc | ||
16 | /dev/tf_ctrl 0660 drmrpc drmrpc | ||
17 | |||
18 | # V4L camera | 10 | # V4L camera |
19 | /dev/video* 0660 system camera | 11 | /dev/video* 0660 system camera |
20 | 12 | ||
21 | # for Bluetooth | 13 | # for Bluetooth |
22 | /dev/hci_tty 0666 bluetooth bluetooth | 14 | /dev/hci_tty 0666 bluetooth bluetooth |
23 | 15 | ||
24 | # Radio | 16 | # Radio Tuners |
25 | /dev/i2c-0 0660 system system | 17 | /dev/i2c-0 0660 system system |
26 | /dev/i2c-1 0660 system system | 18 | /dev/i2c-1 0660 system system |
27 | /dev/i2c-3 0660 system system | 19 | /dev/i2c-3 0660 system system |
28 | /dev/i2c-4 0660 system system | 20 | /dev/i2c-4 0660 system system |
21 | |||
22 | # cmem | ||
29 | /dev/cmem 0660 system system | 23 | /dev/cmem 0660 system system |
30 | 24 | ||
31 | #for GCX | 25 | #for GCX |