summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Heyl <ed@google.com>2011-10-26 15:13:17 +0000
committerEd Heyl <ed@google.com>2011-10-26 15:13:17 +0000
commita3c45533f318d32c42113429947d8bd9a319f414 (patch)
tree342bc4ba367031030d40c84916c8033d8bb04f51
parent60cf403b7215c63fc82e7b87f3c3eb1de01f3f2e (diff)
parent68413dcf58095a921d434455f3b1c7c981369e20 (diff)
downloaddevice_samsung_tuna-a3c45533f318d32c42113429947d8bd9a319f414.zip
device_samsung_tuna-a3c45533f318d32c42113429947d8bd9a319f414.tar.gz
device_samsung_tuna-a3c45533f318d32c42113429947d8bd9a319f414.tar.bz2
Merge remote branch 'goog/ics-mr1-plus-aosp'
-rw-r--r--BoardConfig.mk7
-rw-r--r--kernelbin3807912 -> 3818236 bytes
-rw-r--r--mms144_ts_rev31.fwbin31760 -> 31760 bytes
-rw-r--r--mms144_ts_rev32.fwbin31760 -> 31760 bytes
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml2
5 files changed, 2 insertions, 7 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f2ef2ec..b1a43ac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,12 +30,7 @@ ARCH_ARM_HAVE_TLS_REGISTER := true
TARGET_NO_BOOTLOADER := true
BOARD_KERNEL_BASE := 0x80000000
-
-ifeq ($(strip $(TARGET_BUILD_VARIANT)),user)
-BOARD_KERNEL_CMDLINE :=
-else
-BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 androidboot.console=ttyO2
-endif
+# BOARD_KERNEL_CMDLINE :=
TARGET_NO_RADIOIMAGE := true
TARGET_BOARD_PLATFORM := omap4
diff --git a/kernel b/kernel
index 1910e4e..de96629 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/mms144_ts_rev31.fw b/mms144_ts_rev31.fw
index f05adac..1c9a061 100644
--- a/mms144_ts_rev31.fw
+++ b/mms144_ts_rev31.fw
Binary files differ
diff --git a/mms144_ts_rev32.fw b/mms144_ts_rev32.fw
index 16652f2..66b0650 100644
--- a/mms144_ts_rev32.fw
+++ b/mms144_ts_rev32.fw
Binary files differ
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 55aac19..5e46866 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -76,7 +76,7 @@
than the size of the config_autoBrightnessLevels array.
-->
<integer-array name="config_autoBrightnessLcdBacklightValues">
- <item>10</item>
+ <item>16</item>
<item>40</item>
<item>60</item>
<item>70</item>