squash changes

14 files changed, 31 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index dc8cf1a..d995e30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,8 +33,8 @@ LOCAL_MODULE_TAGS := optional
 #LOCAL_SHARED_LIBRARIES += libext4_utils libz
 include $(BUILD_EXECUTABLE)
 
-endif
-
 ifneq ($(TARGET_SIMULATOR),true)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
+
+endif
diff --git a/BoardConfig.mk b/BoardConfig.mk
index e198b9b..0293377 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,6 +25,9 @@ BOARD_USES_LIBSECRIL_STUB := true
 BOARD_NO_PAGE_FLIPPING := true
 BOARD_NO_32BPP := true
 
+#Kernel Panic Fix
+ARCH_ARM_HAVE_ARMV7A_BUG := true
+
 # Use the non-open-source parts, if they're present
 -include vendor/samsung/crespo/BoardConfigVendor.mk
 
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 3fd9019..f398a85 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -54,7 +54,7 @@ BOARD_KERNEL_BASE := 0x30000000
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_CMDLINE := console=ttyFIQ0 no_console_suspend
 
-TARGET_RECOVERY_UI_LIB := librecovery_ui_crespo
+#TARGET_RECOVERY_UI_LIB := librecovery_ui_crespo
 TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/crespo
 
 TARGET_USERIMAGES_USE_EXT4 := true
@@ -72,3 +72,4 @@ WIFI_DRIVER_FW_AP_PATH      := "/vendor/firmware/fw_bcm4329_apsta.bin"
 WIFI_DRIVER_MODULE_NAME     :=  "bcm4329"
 WIFI_DRIVER_MODULE_ARG      :=  "firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt"
 
+BOARD_HAS_NO_SELECT_BUTTON := true
diff --git a/bcm4329.ko b/bcm4329.ko
index ab50d3f..90cc6a0 100755..100644
--- a/bcm4329.ko
+++ b/bcm4329.ko
diff --git a/board-info.txt b/board-info.txt
index 9ce401c..5824ec3 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,3 @@
 require board=herring
-require version-bootloader=I9020XXJK1|I9020XXKA3|I9020XXKI1
-require version-baseband=I9020XXJK8|I9020XXKB1|I9020XXKD1|I9020XXKF1|I9020XXKI1|I9020UCKB2|I9020UCKD1|I9020UCKF1|I9020KRKB3|M200KRKC1
+require version-bootloader=I9020XXJK1|I9020XXKA3
+require version-baseband=I9020XXJK8|I9020XXKB1|I9020XXKD1|I9020XXKF1|I9020UCKB2|I9020UCKD1|I9020UCKF1|I9020KRKB3|M200KRKC1
diff --git a/device.mk b/device.mk
index c738286..ecfc213 100644
--- a/device.mk
+++ b/device.mk
@@ -46,3 +46,4 @@ $(call inherit-product, device/samsung/crespo/device_base.mk)
 # commonly available
 $(call inherit-product-if-exists, vendor/samsung/crespo/device-vendor.mk)
 
+$(call inherit-product-if-exists, vendor/samsung/crespo/device-vendor-blobs.mk)
diff --git a/device_base.mk b/device_base.mk
index 705820e..350b01d 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -100,6 +100,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
 	device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
 
+# Kernel debug file
+PRODUCT_COPY_FILES += \
+	device/samsung/crespo/klogtail:system/xbin/klogtail
+
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
 	frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
@@ -146,7 +150,8 @@ LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE)
 endif
 
 PRODUCT_COPY_FILES += \
-	$(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko
+	$(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko \
+	device/samsung/crespo/scsi_wait_scan.ko:system/modules/scsi_wait_scan.ko
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := device/samsung/crespo/kernel
diff --git a/egl.cfg b/egl.cfg
index 45af426..3e1a8c6 100644
--- a/egl.cfg
+++ b/egl.cfg
@@ -1,2 +1 @@
-0 0 android
 0 1 POWERVR_SGX540_120
diff --git a/full_crespo.mk b/full_crespo.mk
index c6957e0..3b1c94e 100644
--- a/full_crespo.mk
+++ b/full_crespo.mk
@@ -20,13 +20,13 @@
 #
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 # This is where we'd set a backup provider if we had one
 #$(call inherit-product, device/sample/products/backup_overlay.mk)
 $(call inherit-product, device/samsung/crespo/device.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk)
 
 # Discard inherited values and use our own instead.
 PRODUCT_NAME := full_crespo
 PRODUCT_DEVICE := crespo
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := Full Android on Crespo
diff --git a/init.herring.rc b/init.herring.rc
index 2936b02..588d078 100755
--- a/init.herring.rc
+++ b/init.herring.rc
@@ -16,6 +16,11 @@ on boot
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/dhcp 0770 dhcp dhcp
 
+# Dimmer, and others enabled permissions
+    chmod 700 /sys/class/misc/backlightdimmer/enabled
+    chmod 700 /sys/class/misc/screendimmer/enabled
+    chmod 700 /sys/class/misc/touchwake/enabled
+
 # phone
     setprop ro.telephony.call_ring.multiple 0
 
@@ -35,7 +40,10 @@ on fs
 	chmod 770 /efs/bluetooth
 	chmod 770 /efs/imei
     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
+    mount ext4 /dev/block/platform/s3c-sdhci.0/by-name/userdata /data wait noatime nosuid nodev noauto_da_alloc
+
+# Increase readahead buffers on MMC devices
+    write /sys/block/mmcblk0/bdi/read_ahead_kb 1024
 
 # permissions for bluetooth.
     chown bluetooth bluetooth /efs/bluetooth
@@ -82,7 +90,7 @@ service wpa_supplicant /system/bin/wpa_supplicant -Dwext -ieth0 -c/data/misc/wif
 
 # DHCPCD
 # wi-fi
-service dhcpcd_eth0 /system/bin/dhcpcd -ABKL
+service dhcpcd_eth0 /system/bin/dhcpcd -ABKL eth0
     disabled
     oneshot
 
diff --git a/kernel b/kernel
index 2dcbc70..5065246 100755
--- a/kernel
+++ b/kernel
diff --git a/klogtail b/klogtail
new file mode 100644
index 0000000..d0d0ee3
--- /dev/null
+++ b/klogtail
diff --git a/scsi_wait_scan.ko b/scsi_wait_scan.ko
new file mode 100644
index 0000000..e2483da
--- /dev/null
+++ b/scsi_wait_scan.ko
diff --git a/system.prop b/system.prop
index c445964..a3e7507 100644
--- a/system.prop
+++ b/system.prop
@@ -5,3 +5,6 @@
 rild.libpath=/vendor/lib/libsec-ril.so
 rild.libargs=-d /dev/ttyS0
 ro.sf.lcd_density=240
+
+# Define to manage ril to manage modem answere when going from 2G to 3G
+ro.ril.ntmodeglobal=true