| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-08-22 02:37:05 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-08-22 02:37:06 (GMT) |
| commit | c9fe414fd91afae7e5af65fc2d5f46c502aed054 (patch) | |
| tree | ced0c511457aa00002975c4609be285db78f4cac | |
| parent | fdfeb971fecac2586c7971575816ef64fda61a68 (diff) | |
| parent | d0929471d049555f4d4a1ecd1be156439ff924b8 (diff) | |
| download | braun-ampere-20180821.zip braun-ampere-20180821.tar.gz braun-ampere-20180821.tar.bz2 | |
Merge "braun: Compatible with system as root and normal [2/9]" into p-amlogic
| -rw-r--r-- | braun.mk | 10 | ||||
| -rw-r--r-- | device.mk | 5 | ||||
| -rw-r--r-- | recovery/recovery.fstab | 29 |
3 files changed, 29 insertions, 15 deletions
@@ -194,18 +194,8 @@ PRODUCT_PACKAGES += \ slideshow endif -ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE), true) PRODUCT_COPY_FILES += \ device/amlogic/braun/fstab.system.amlogic:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.amlogic -else -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += \ - device/amlogic/braun/fstab.amlogic:root/fstab.amlogic -else -PRODUCT_COPY_FILES += \ - device/amlogic/braun/fstab.amlogic:recovery/root/fstab.amlogic -endif -endif ######################################################################### # @@ -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/braun/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..4c4ab59 --- 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 |