summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-08-21 06:12:20 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-08-21 09:23:19 (GMT)
commitd971cc4257500b221e5ed4f265bdb69da5711abb (patch)
tree2fa78a2a5b7b81bd094b8b8f2a6cb90547da3461
parent55ecf114b514a482579716bcab570eb92fd2ec29 (diff)
downloadeinstein-d971cc4257500b221e5ed4f265bdb69da5711abb.zip
einstein-d971cc4257500b221e5ed4f265bdb69da5711abb.tar.gz
einstein-d971cc4257500b221e5ed4f265bdb69da5711abb.tar.bz2
einstein: Compatible with system as root and normal [5/9]
PD# 172209 Compatible with system as root and normal Change-Id: Ide45587305f27366667b98fe05ea391c485e0fa5
Diffstat
-rw-r--r--device.mk5
-rw-r--r--einstein.mk10
-rw-r--r--recovery/recovery.fstab29
3 files changed, 29 insertions, 15 deletions
diff --git a/device.mk b/device.mk
index 74cf313..0de6503 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/einstein/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \
diff --git a/einstein.mk b/einstein.mk
index c0d1fe9..fe3d38a 100644
--- a/einstein.mk
+++ b/einstein.mk
@@ -204,18 +204,8 @@ PRODUCT_PACKAGES += \
slideshow
endif
-ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true)
PRODUCT_COPY_FILES += \
device/amlogic/einstein/fstab.system.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic
-else
-ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
-PRODUCT_COPY_FILES += \
- device/amlogic/einstein/fstab.amlogic:root/fstab.amlogic
-else
-PRODUCT_COPY_FILES += \
- device/amlogic/einstein/fstab.amlogic:recovery/root/fstab.amlogic
-endif
-endif
#########################################################################
#
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