summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-08-21 06:01:14 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-08-21 09:22:22 (GMT)
commite032f45421c6fa91f85a08c7087270d17b6a1ca2 (patch)
treee9743e3f591283079a4d5c28f72b5b55f5ff4f69
parentda3a00b41f24e278e3237632942a78f2b932bc00 (diff)
downloadcurie-e032f45421c6fa91f85a08c7087270d17b6a1ca2.zip
curie-e032f45421c6fa91f85a08c7087270d17b6a1ca2.tar.gz
curie-e032f45421c6fa91f85a08c7087270d17b6a1ca2.tar.bz2
curie: Compatible with system as root and normal [3/9]
PD# 172209 Compatible with system as root and normal Change-Id: I8c83df41878a6da8d7fc5851f86a854adcc1c586
Diffstat
-rw-r--r--curie.mk10
-rw-r--r--device.mk5
-rw-r--r--recovery/recovery.fstab29
3 files changed, 29 insertions, 15 deletions
diff --git a/curie.mk b/curie.mk
index aa94e83..5740f1d 100644
--- a/curie.mk
+++ b/curie.mk
@@ -199,18 +199,8 @@ PRODUCT_PACKAGES += \
slideshow
endif
-ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
PRODUCT_COPY_FILES += \
device/amlogic/curie/fstab.system.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic
-else
-ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
-PRODUCT_COPY_FILES += \
- device/amlogic/curie/fstab.amlogic:root/fstab.amlogic
-else
-PRODUCT_COPY_FILES += \
- device/amlogic/curie/fstab.amlogic:recovery/root/fstab.amlogic
-endif
-endif
#########################################################################
#
diff --git a/device.mk b/device.mk
index f992d51..f8685db 100644
--- a/device.mk
+++ b/device.mk
@@ -14,13 +14,8 @@
# limitations under the License.
#
-ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
PRODUCT_COPY_FILES += \
device/amlogic/common/products/mbox/init.amlogic.system.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc
-else
-PRODUCT_COPY_FILES += \
- device/amlogic/common/products/mbox/init.amlogic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc
-endif
PRODUCT_COPY_FILES += \
device/amlogic/curie/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \
diff --git a/recovery/recovery.fstab b/recovery/recovery.fstab
new file mode 100644
index 0000000..f1c4988
--- a/dev/null
+++ b/recovery/recovery.fstab
@@ -0,0 +1,29 @@
+#device mountpoint fstype options flags? (fstab version 2)
+/dev/block/bootloader /bootloader emmc defaults defaults
+/dev/block/logo /logo emmc defaults defaults
+/dev/block/vbmeta /vbmeta emmc defaults defaults
+/dev/block/recovery /recovery emmc defaults defaults
+/dev/block/boot /boot emmc defaults defaults
+/dev/block/misc /misc emmc defaults defaults
+/dev/block/system /system ext4 defaults defaults
+/dev/block/vendor /vendor ext4 defaults defaults
+/dev/block/odm /odm ext4 defaults defaults
+/dev/block/product /product ext4 defaults defaults
+/dev/block/metadata /metadata ext4 defaults defaults
+/dev/block/tee /tee ext4 defaults defaults
+/dev/block/cache /cache ext4 defaults defaults
+/dev/block/data /data ext4 defaults encryptable=footer
+/dev/block/mmcblk1p1 /sdcard vfat defaults defaults
+/dev/block/mmcblk1p2 /sdcard vfat defaults defaults
+/dev/block/mmcblk1p3 /sdcard vfat defaults defaults
+/dev/block/mmcblk1p4 /sdcard vfat defaults defaults
+/dev/block/mmcblk1p5 /sdcard vfat defaults defaults
+/dev/block/mmcblk1p6 /sdcard vfat defaults defaults
+/dev/block/mmcblk2p1 /sdcard vfat defaults defaults
+/dev/block/mmcblk2p2 /sdcard vfat defaults defaults
+/dev/block/mmcblk2p3 /sdcard vfat defaults defaults
+/dev/block/mmcblk2p4 /sdcard vfat defaults defaults
+/dev/block/mmcblk2p5 /sdcard vfat defaults defaults
+/dev/block/mmcblk2p6 /sdcard vfat defaults defaults
+/dev/block/mmcblk /sdcard vfat defaults defaults
+/dev/block/sd## /udisk auto defaults defaults