am ce6d0158: am 16462abc: am 0f3374a5: Merge "Only list the 4.0.4 versions."
* commit 'ce6d0158c951c98293e9ad902f220f215e8a5ab8':
Only list the 4.0.4 versions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 76e14c9..d3b8b6f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -20,6 +20,10 @@
# Use the non-open-source parts, if they're present
-include vendor/samsung/crespo/BoardConfig4gVendor.mk
+# Use the open-source board-info file if none was set by the vendor
+# config.
+TARGET_BOARD_INFO_FILE ?= device/samsung/crespo4g/board-info.txt
+
# Use the parts that are common between all crespos
include device/samsung/crespo/BoardConfigCommon.mk
diff --git a/board-info.txt b/board-info.txt
index 07a65dc..e02b935 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,6 @@
+# This is the open-source version of board-info.txt; it should contain
+# version of the radio and bootloader that are available to the
+# public.
require board=herring
require version-bootloader=D720SPRKE1
require version-baseband=D720SPRLC1
diff --git a/crespo4g_overlay/frameworks/base/core/res/res/values/config.xml b/crespo4g_overlay/frameworks/base/core/res/res/values/config.xml
index 24b48ba..4a6afc6 100755
--- a/crespo4g_overlay/frameworks/base/core/res/res/values/config.xml
+++ b/crespo4g_overlay/frameworks/base/core/res/res/values/config.xml
@@ -106,7 +106,7 @@
</string-array>
<!-- Set and Unsets WiMAX -->
- <bool name="config_wimaxEnabled">true</bool>
+ <bool name="config_wimaxEnabled">false</bool>
<!-- Location of the wimax framwork jar location -->
<string name="config_wimaxServiceJarLocation">/vendor/lib/wimax_service.jar</string>
<!-- Location of the wimax native library locaiton -->
diff --git a/device.mk b/device.mk
old mode 100755
new mode 100644
index 85ee3d4..2302d64
--- a/device.mk
+++ b/device.mk
@@ -52,7 +52,7 @@
# Hardware-specific features
PRODUCT_COPY_FILES += \
- frameworks/base/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
+ frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
device/samsung/crespo4g/init.herring.rc:root/init.herring.rc
# GPS config
diff --git a/full_crespo4g.mk b/full_crespo4g.mk
index 30c57d2..3713b79 100644
--- a/full_crespo4g.mk
+++ b/full_crespo4g.mk
@@ -19,10 +19,6 @@
# product configuration (apps).
#
-# Camera
-PRODUCT_PACKAGES := \
- Camera
-
# Live Wallpapers
PRODUCT_PACKAGES += \
LiveWallpapers \
diff --git a/gps.conf b/gps.conf
index bd431a6..e3fb1df 100755
--- a/gps.conf
+++ b/gps.conf
@@ -1,4 +1,3 @@
-NTP_SERVER=north-america.pool.ntp.org
XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin
XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin
XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin
diff --git a/init.herring.rc b/init.herring.rc
index d6a3a6c..345b8b6 100755
--- a/init.herring.rc
+++ b/init.herring.rc
@@ -44,9 +44,11 @@
mount ext4 /dev/block/platform/s3c-sdhci.0/by-name/system /system wait ro
mount ext4 /dev/block/platform/s3c-sdhci.0/by-name/userdata /data wait noatime nosuid nodev nomblk_io_submit
- export EXTERNAL_STORAGE /mnt/sdcard
- mkdir /mnt/sdcard 0000 system system
- symlink /mnt/sdcard /sdcard
+ export EXTERNAL_STORAGE /storage/sdcard0
+ mkdir /storage 0550 system sdcard_r
+ mkdir /storage/sdcard0 0000 system system
+ symlink /storage/sdcard0 /sdcard
+ symlink /storage/sdcard0 /mnt/sdcard
# permissions for bluetooth.
chown bluetooth bluetooth /efs/bluetooth
@@ -69,6 +71,11 @@
# Permissions for System Server and daemons.
chown system system /sys/class/backlight/s5p_bl/brightness
+# Configure and enable KSM
+ write /sys/kernel/mm/ksm/pages_to_scan 100
+ write /sys/kernel/mm/ksm/sleep_millisecs 500
+ write /sys/kernel/mm/ksm/run 1
+
on post-fs-data
# wi-fi
mkdir /data/misc/wifi/sockets 0770 wifi wifi
@@ -99,7 +106,7 @@
group root
oneshot
-service wpa_supplicant /system/bin/wpa_supplicant -Dwext -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf
+service wpa_supplicant /system/bin/wpa_supplicant -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf
class main
socket wpa_wlan0 dgram 0660 wifi wifi
disabled