| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-08-22 02:37:36 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-08-22 02:37:36 (GMT) |
| commit | 843e86cc29280e0b0ae7c6d19ae4ee3b74b332b6 (patch) | |
| tree | 8fe5de2e2b8a8f7c80ed9caf06c0cd490295d758 | |
| parent | 7fd02625eca7a76135f3311ae8fe9c1f8b9f25b1 (diff) | |
| parent | d971cc4257500b221e5ed4f265bdb69da5711abb (diff) | |
| download | einstein-843e86cc29280e0b0ae7c6d19ae4ee3b74b332b6.zip einstein-843e86cc29280e0b0ae7c6d19ae4ee3b74b332b6.tar.gz einstein-843e86cc29280e0b0ae7c6d19ae4ee3b74b332b6.tar.bz2 | |
Merge "einstein: Compatible with system as root and normal [5/9]" into p-amlogic
| -rw-r--r-- | device.mk | 5 | ||||
| -rw-r--r-- | einstein.mk | 10 | ||||
| -rw-r--r-- | recovery/recovery.fstab | 29 |
3 files changed, 29 insertions, 15 deletions
@@ -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 6e05176..6e50946 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 |