提交: 10b4df8bfde7aee0c1c91ed3cf6c4025f52e2a64 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• 修訂: 10b4df8bfde7aee0c1c91ed3cf6c4025f52e2a64 (tree)
• 時間: 2016-09-27 23:15:21
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
BoardConfig.mk

Change Summary

• modified: BoardConfig.mk
• modified: init.sh
• modified: modules.blacklist

差異

--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -74,7 +74,7 @@ TARGET_HARDWARE_3D := true
 BOARD_EGL_CFG ?= device/generic/common/gpu/egl_mesa.cfg
 endif
 
-BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.hardware=$(PRODUCT_RELEASE_NAME)
+BOARD_KERNEL_CMDLINE := root=/dev/ram0
 
 COMPATIBILITY_ENHANCEMENT_PACKAGE := true
 PRC_COMPATIBILITY_PACKAGE := true

--- a/init.sh
+++ b/init.sh
@@ -229,6 +229,12 @@ function init_hal_sensors()
 		*i7Stylus*)
 			set_property hal.sensors.iio.accel.matrix 1,0,0,0,-1,0,0,0,-1
 			;;
+		*ST70416-6*)
+			set_property hal.sensors.iio.accel.matrix 0,-1,0,-1,0,0,0,0,-1
+			;;
+		*ONDATablet*)
+			set_property hal.sensors.iio.accel.matrix 0,1,0,1,0,0,0,0,-1
+			;;
 		*)
 			;;
 	esac

--- a/modules.blacklist
+++ b/modules.blacklist
@@ -1 +1,4 @@
 blacklist evbug
+deferred  amdgpu
+deferred  nouveau
+deferred  radeon