Fix reboots problem & cleanup

AndroidBoard.mk

@@ -23,6 +23,3 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-
-# include the non-open-source counterpart to this file
--include vendor/huawei/u8815/AndroidBoardVendor.mk

AndroidProducts.mk

@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/device_u8815.mk
+    $(LOCAL_DIR)/device_u8815.mk

BoardConfig.mk

@@ -14,51 +14,51 @@
 # limitations under the License.
 #
 
-# inherit from the proprietary version
--include vendor/huawei/u8815/BoardConfigVendor.mk
-
-# CPU
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGER_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_OTA_ASSERT_DEVICE := hwu8815,u8815,hwu8818,u8818
 
-# Board name
+# Platform
 TARGET_BOOTLOADER_BOARD_NAME := u8815
 TARGET_BOARD_PLATFORM := msm7x27a
-
-# Target arch settings
-TARGET_NO_BOOTLOADER := true
 TARGET_BOARD_PLATFORM_GPU := qcom-adreno200
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_RADIOIMAGE := true
+
+# Architecture
+TARGER_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_SMP := true
 ARCH_ARM_HAVE_TLS_REGISTER := true
 TARGET_CORTEX_CACHE_LINE_32 := true
 
-# Recovery image settings 
-BOARD_KERNEL_CMDLINE := console=ttyMSM1,115200
+# Partitions
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x12C00000
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x0AF00000
+BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00C00000
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00C00000
+BOARD_FLASH_BLOCK_SIZE := 0x00020000
+TARGET_USERIMAGES_USE_EXT4 := true
+
+# Kernel
+BOARD_KERNEL_CMDLINE := androidboot.hardware=huawei
 BOARD_KERNEL_BASE := 0x00200000
-BOARD_PAGE_SIZE := 0x00001000
+BOARD_PAGE_SIZE := 2048
 TARGET_PREBUILT_KERNEL := device/huawei/u8815/kernel
 
-# USB mounting
-TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/class/android_usb/android0/f_mass_storage/lun%d/file
+# USB Mounting
 BOARD_UMS_LUNFILE := "/sys/class/android_usb/android0/f_mass_storage/lun%d/file"
 
 # Recovery
+BOARD_HAS_NO_SELECT_BUTTON := true
+TARGET_PREBUILT_RECOVERY_KERNEL := device/huawei/u8815/kernel
 TARGET_RECOVERY_INITRC := device/huawei/u8815/init.rc
-BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00C00000
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00C00000
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x12C00000
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x0AF00000
-BOARD_FLASH_BLOCK_SIZE := 0x00020000
-
-BOARD_USES_MMCUTILS := true
+BOARD_CUSTOM_GRAPHICS := ../../../device/huawei/u8815/recovery/graphics.c
 BOARD_HAS_NO_MISC_PARTITION := true
-TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_USES_MMCUTILS := true
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
-BOARD_CUSTOM_GRAPHICS := ../../../device/huawei/u8815/recovery/graphics.c
-BOARD_USE_CUSTOM_RECOVERY_FONT:= \"roboto_10x18.h\"
+TW_BOARD_CUSTOM_GRAPHICS := ../../../device/huawei/u8815/recovery/graphics.c
 DEVICE_RESOLUTION := 480x800
-RECOVERY_GRAPHICS_USE_LINELENGTH := true
 SP1_NAME := "cust"
 SP1_BACKUP_METHOD := files
 SP1_MOUNTABLE := 1
@@ -67,5 +67,6 @@ SP2_BACKUP_METHOD := files
 SP2_MOUNTABLE := 1
 TW_EXTERNAL_STORAGE_PATH := "/sdcard"
 TW_EXTERNAL_STORAGE_MOUNT_POINT := "sdcard"
-
-TARGET_OTA_ASSERT_DEVICE := hwu8815,u8815,hwu8818,u8818
+TARGET_USE_CUSTOM_LUN_FILE_PATH := /sys/class/android_usb/android0/f_mass_storage/lun%d/file
+BOARD_USE_CUSTOM_RECOVERY_FONT:= \"roboto_10x18.h\"
+RECOVERY_GRAPHICS_USE_LINELENGTH := true

cm.mk

@@ -1,22 +1,15 @@
-## Specify phone tech before including full_phone
+# Inherit CM common GSM stuff.
 $(call inherit-product, vendor/cm/config/gsm.mk)
 
-# Inherit some common CM stuff.
+# Inherit CM common Phone stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-# Inherit device configuration
+# Inherit device configuration.
 $(call inherit-product, device/huawei/u8815/device_u8815.mk)
 
-#
-# Setup device specific product configuration.
-#
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
+# Device identifier.
+PRODUCT_DEVICE := u8815
 PRODUCT_NAME := cm_u8815
 PRODUCT_BRAND := huawei
-PRODUCT_DEVICE := u8815
 PRODUCT_MODEL := Ascend G300
 PRODUCT_MANUFACTURER := huawei
-
-# Release name and versioning
-PRODUCT_RELEASE_NAME := U8815
-

device_u8815.mk

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 # Inherit common language setup
+$(call inherit-product, build/target/product/full_base_telephony.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
 # Inherit u8815 vendor setup
@@ -29,9 +30,3 @@ PRODUCT_COPY_FILES += \
   device/huawei/u8815/recovery/sbin/libhwrpc.so:/recovery/root/sbin/libhwrpc.so \
   device/huawei/u8815/recovery/sbin/liboeminfo.so:/recovery/root/sbin/liboeminfo.so \
   device/huawei/u8815/recovery/sbin/charge.sh:/recovery/root/sbin/charge.sh
-
-# Device Naming
-PRODUCT_NAME := full_u8815
-PRODUCT_DEVICE := u8815
-PRODUCT_BRAND := huawei
-PRODUCT_MODEL := Huawei Ascend G300

init.rc

@@ -1,76 +1,73 @@
-on early-init
-    start ueventd
-
-on init
-    export PATH /sbin
-    export LD_LIBRARY_PATH .:/sbin:/system/lib
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-
-    mkdir /boot
-    mkdir /sdcard
-    mkdir /sd-ext
-    mkdir /datadata
-    mkdir /cust
-    mkdir /emmc
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mkdir /internal_sd
-    mount /tmp /tmp tmpfs
-
-# Always start adbd on userdebug and eng builds
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 12d1
-    write /sys/class/android_usb/android0/idProduct 1038
-    write /sys/class/android_usb/android0/f_mass_storage/cdrom_index none
-    write /sys/class/android_usb/android0/f_mass_storage/nluns 2
-    write /sys/class/android_usb/android0/functions mass_storage,adb
-
-on boot
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-
-service ueventd /sbin/ueventd
-    critical
-
-service recovery /sbin/recovery
-
-service adbd /sbin/adbd recovery
-    disabled
-
-service rmt_storage /sbin/rmt_storage
-    class main
-    user root
-    disabled
-
-service rmt_oeminfo /sbin/rmt_oeminfo
-    class main
-    user root
-    oneshot
-
-on property:ro.boot.emmc=true
-    start rmt_oeminfo
-    start rmt_storage
-
-service recovery /sbin/sh /sbin/charge.sh
-    oneshot
-
-service charge /sbin/charge
-    oneshot
-
-#start adbd
-on property:ro.debuggable=1
-    setprop service.adb.root 1
-
-# Restart adbd so it can run as root
-on property:service.adb.root=1
-    write /sys/class/android_usb/android0/enable 0
-    restart adbd
-    write /sys/class/android_usb/android0/enable 1
+on early-init
+    start ueventd
+
+on init
+    export PATH /sbin
+    export LD_LIBRARY_PATH .:/sbin
+    export ANDROID_ROOT /system
+    export ANDROID_DATA /data
+    export EXTERNAL_STORAGE /sdcard
+
+    symlink /system/etc /etc
+
+    mkdir /boot
+    mkdir /sdcard
+    mkdir /sd-ext
+    mkdir /cust
+    mkdir /datadata
+    mkdir /emmc
+    mkdir /internal_sd
+    mkdir /system
+    mkdir /data
+    mkdir /cache
+    mount /tmp /tmp tmpfs
+
+    chown root shell /tmp
+    chmod 0775 /tmp
+
+# Always start adbd on userdebug and eng builds
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 12d1
+    write /sys/class/android_usb/android0/idProduct 1038
+    write /sys/class/android_usb/android0/functions mass_storage,adb
+    write /sys/class/android_usb/android0/f_mass_storage/cdrom_index none
+    write /sys/class/android_usb/android0/f_mass_storage/nluns 2
+
+on boot
+    ifup lo
+    hostname localhost
+    domainname localdomain
+
+    class_start default
+
+service ueventd /sbin/ueventd
+    critical
+
+service adbd /sbin/adbd recovery
+    disabled
+
+service recovery /sbin/recovery
+
+service recovery /sbin/sh /sbin/charge.sh
+    oneshot
+
+service charge /sbin/charge
+    oneshot
+
+service rmt_storage /sbin/rmt_storage
+
+
+service rmt_oeminfo /sbin/rmt_oeminfo
+    oneshot
+
+#start adbd
+on property:ro.debuggable=1
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop service.adb.root 1
+
+# Restart adbd so it can run as root
+on property:service.adb.root=1
+    write /sys/class/android_usb/android0/enable 0
+    restart adbd
+    write /sys/class/android_usb/android0/enable 1

recovery.fstab

@@ -1,12 +1,12 @@
-# mount point	fstype		device			
+# mount point	    fstype		device			
 
-/boot		emmc		/dev/block/mmcblk0p15
-/cache		ext4		/dev/block/mmcblk0p6
-/data		ext4		/dev/block/mmcblk0p13
-/system		ext4		/dev/block/mmcblk0p12
-/internal_sd   	vfat		/dev/block/mmcblk0p19
-/sdcard		vfat		/dev/block/mmcblk1p1	/dev/block/mmcblk1	
-/misc		emmc		/dev/block/mmcblk0p7
-/recovery       emmc            /dev/block/mmcblk0p16
-/cust		ext4		/dev/block/mmcblk0p18
-/sd-ext		ext4		/dev/block/mmcblk1p2
+/cache		    ext4		/dev/block/mmcblk0p6
+/misc		    emmc		/dev/block/mmcblk0p7
+/system		    ext4		/dev/block/mmcblk0p12
+/data		    ext4		/dev/block/mmcblk0p13
+/boot		    emmc		/dev/block/mmcblk0p15
+/recovery           emmc                /dev/block/mmcblk0p16
+/cust		    ext4		/dev/block/mmcblk0p18
+/internal_sd  	    vfat	        /dev/block/mmcblk0p19
+/sdcard		    vfat		/dev/block/mmcblk1p1	/dev/block/mmcblk1	
+/sd-ext		    ext4		/dev/block/mmcblk1p2