Update old blade2, thinking common might be causing probs

dazjo · Feb 7, 2013 · 81440af · 81440af
1 parent 1d729f4
commit 81440af
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 17 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -17,6 +17,7 @@
 include device/zte/msm7x27-common/BoardConfigCommon.mk
 include vendor/zte/blade2/BoardConfigVendor.mk
 
+TARGET_PREBUILT_RECOVERY_KERNEL := device/zte/blade2/prebuilt/recovery_kernel
 TARGET_RECOVERY_INITRC := device/zte/blade2/recovery/recovery.rc
 
 # Kernel
@@ -42,6 +43,7 @@ WIFI_DRIVER_FW_PATH_STA := "/system/etc/fw_4330_b1_apsta.bin"
 WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/fw_4330b1.bin nvram_path=/system/etc/nv_4330b1.txt iface_name=wlan"
 WIFI_DRIVER_MODULE_NAME := "dhd"
 WIFI_BAND := 802_11_ABG
+WIFI_DRIVER_LOADER_REUSE := true
 
 # Bluetooth
 BOARD_HAVE_BLUETOOTH_BCM := true

diff --git a/blade2.mk b/blade2.mk
@@ -1,4 +1,5 @@
-# Copyright (C) 2011 The Android Open Source Project
+#
+# Copyright (C) 2013 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,10 +22,6 @@
 # lines, full and toro, hence its name.
 #
 
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
-
 # Inherit from blade2 device
 $(call inherit-product, device/zte/blade2/device.mk)
 
@@ -34,3 +31,4 @@ PRODUCT_DEVICE := blade2
 PRODUCT_BRAND := ZTE
 PRODUCT_MANUFACTURER := ZTE
 PRODUCT_MODEL := Crescent
+PRODUCT_RELEASE_NAME := Crescent
diff --git a/cm.mk b/cm.mk
@@ -1,6 +1,3 @@
-# Inherit device configuration.
-$(call inherit-product, device/zte/blade2/blade2.mk)
-
 # Correct boot animation size for the screen.
 TARGET_SCREEN_HEIGHT := 800
 TARGET_SCREEN_WIDTH := 480
@@ -9,11 +6,10 @@ TARGET_SCREEN_WIDTH := 480
 $(call inherit-product, vendor/cm/config/gsm.mk)
 $(call inherit-product, vendor/cm/config/tiny.mk)
 
+# Inherit device configuration.
+$(call inherit-product, device/zte/blade2/blade2.mk)
+
 PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=blade2 BUILD_ID=JRO03C BUILD_FINGERPRINT=ZTE/N880E_JB/atlas40:4.1.1/JRO03C/eng.songsy.20120718.233441:eng/test-keys PRIVATE_BUILD_DESC="N880E_JB-eng 4.1.1 JRO03C eng.songsy.20120718.233441 test-keys" BUILD_NUMBER=eng.songsy.20120718.233441
 
+# Set this variable here to overwrite the inherited value.
 PRODUCT_NAME := cm_blade2
-PRODUCT_DEVICE := blade2
-PRODUCT_BRAND := ZTE
-PRODUCT_MANUFACTURER := ZTE
-PRODUCT_MODEL := Crescent
-PRODUCT_RELEASE_NAME := Crescent
diff --git a/device.mk b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 The Android Open-Source Project
+# Copyright (C) 2013 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
 # limitations under the License.
 #
 
-include device/zte/msm7x27-common/common.mk
+$(call inherit-product, device/zte/msm7x27-common/common.mk)
 $(call inherit-product, vendor/zte/blade2/blade2-vendor.mk)
+$(call inherit-product-if-exists, device/zte/blade2/packages.mk)
 
 # Baseband versions for device variations
 ifdef P736E

diff --git a/packages.mk b/packages.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2013 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+PRODUCT_PACKAGES += \
+    Chronus \
+    CMUpdater \
+    Email \
+    LockClock
diff --git a/prebuilt/recovery_kernel b/prebuilt/recovery_kernel
diff --git a/ramdisk/init.blade2.rc b/ramdisk/init.blade2.rc
@@ -10,6 +10,13 @@ on early-init
 
 on boot
 
+# Setup boostpulse
+    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ondemand
+    chown system system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate
+    chown system system /sys/devices/system/cpu/cpufreq/ondemand/boostpulse
+    chmod 0666 /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate
+    chmod 0666 /sys/devices/system/cpu/cpufreq/ondemand/boostpulse
+
 # cpufreq configurations
     write /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate 500000
     write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold 90

diff --git a/recovery/recovery.rc b/recovery/recovery.rc
@@ -1,6 +1,10 @@
 on early-init
     start ueventd
 
+# Setup android gadget
+    write /sys/module/g_android/parameters/serial_number CM10.1-Crescent
+    write /sys/module/g_android/parameters/product_id 0x1351
+
 on init
     export PATH /sbin
     export ANDROID_ROOT /system
@@ -25,6 +29,10 @@ on init
     mount /dev/block/vold/179:1 /sdcard/ vfat
     symlink /sdcard /mnt/sdcard
 
+# ADB sideload permissions
+    chown root shell /tmp
+    chmod 0775 /tmp
+
 on boot
     ifup lo
     hostname localhost

diff --git a/system.prop b/system.prop
@@ -26,10 +26,9 @@ ro.vold.umsdirtyratio=20
 
 # Dalvik VM
 dalvik.vm.dexopt-data-only=1
+dalvik.vm.dexopt-flags=v=a,o=v,m=y,u=y
 dalvik.vm.execution-mode=int:jit
-dalvik.vm.verify_bytecode=false
 dalvik.vm.checkjni=0
-ro.kernel.android.checkjni=0
 
 # zRam
 ro.zram.default=0