aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsbrissen <sbrissen@hotmail.com>2013-08-08 07:59:34 -0400
committersbrissen <sbrissen@hotmail.com>2013-08-08 07:59:34 -0400
commit65f14a84ff9c674dd85fef0c6b72ce5cee638586 (patch)
tree353056b845f362a394101f039395250b71633b51
parent607cb13514ee2f5c086de10882bfe821837c5508 (diff)
downloaddevice_samsung_n5110-65f14a84ff9c674dd85fef0c6b72ce5cee638586.zip
device_samsung_n5110-65f14a84ff9c674dd85fef0c6b72ce5cee638586.tar.gz
device_samsung_n5110-65f14a84ff9c674dd85fef0c6b72ce5cee638586.tar.bz2
4.3 bring up
-remove recovery.fstab -unified fstab
-rw-r--r--BoardConfig.mk3
-rw-r--r--n5110.mk3
-rw-r--r--recovery.fstab12
-rwxr-xr-x[-rw-r--r--]rootdir/fstab.smdk4x1210
-rwxr-xr-x[-rw-r--r--]rootdir/init.smdk4x12.rc1
5 files changed, 14 insertions, 15 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 24d31a7..d396e32 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,6 +40,9 @@ BOARD_BATTERY_DEVICE_NAME := "battery"
BOARD_CHARGER_RES := device/samsung/n5110/res/charger
# Recovery
+TARGET_RECOVERY_FSTAB := device/samsung/n5110/rootdir/fstab.smdk4x12
+RECOVERY_FSTAB_VERSION := 2
+
# inherit from the proprietary version
-include vendor/samsung/n5110/BoardConfigVendor.mk
diff --git a/n5110.mk b/n5110.mk
index 68ca0b1..7f3370f 100644
--- a/n5110.mk
+++ b/n5110.mk
@@ -38,7 +38,8 @@ PRODUCT_PACKAGES += \
tiny_hw \
libsecril-client \
DeviceSettings \
- SamsungServiceMode
+ SamsungServiceMode \
+ VoicePlus
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml \
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100644
index d1e7503..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount point fstype device device2
-/efs ext4 /dev/block/mmcblk0p3
-/boot emmc /dev/block/mmcblk0p5
-/recovery emmc /dev/block/mmcblk0p6
-/cache ext4 /dev/block/mmcblk0p8
-/system ext4 /dev/block/mmcblk0p9
-/data ext4 /dev/block/mmcblk0p12 length=-16384
-/preload ext4 /dev/block/mmcblk0p10
-/modem emmc /dev/block/mmcblk0p7
-
-/sdcard datamedia /dev/null
-/external_sd vfat /dev/block/mmcblk1p1 fstype2=ext4
diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12
index 62f53ac..b0f5a03 100644..100755
--- a/rootdir/fstab.smdk4x12
+++ b/rootdir/fstab.smdk4x12
@@ -3,9 +3,17 @@
# The filesystem that contains the filesystem checker binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
# data partition must be located at the bottom for supporting device encryption
-
/dev/block/mmcblk0p9 /system ext4 ro,errors=panic wait
/dev/block/mmcblk0p3 /efs ext4 nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic wait,check
/dev/block/mmcblk0p8 /cache ext4 nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic wait,check
/dev/block/mmcblk0p12 /data ext4 nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic wait,check,encryptable=footer
+# vold-managed volumes ("block device" is actually a sysfs devpath)
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto
+/devices/platform/s5p-ehci /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto
+
+# recovery
+/dev/block/mmcblk0p5 /boot emmc defaults recoveryonly
+/dev/block/mmcblk0p6 /recovery emmc defaults recoveryonly
+/dev/block/mmcblk0p7 /modem emmc defaults recoveryonly
+/dev/block/mmcblk1p1 /external_sd auto defaults recoveryonly \ No newline at end of file
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index dc5fd02..31db4eb 100644..100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -425,7 +425,6 @@ on boot
setprop ro.build.product smdk4x12
setprop ro.product.device smdk4x12
- setprop ro.radio.noril yes
setprop wifi.interface wlan0
# fake some battery state