summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-08-21 05:59:37 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-08-21 09:22:02 (GMT)
commitd0929471d049555f4d4a1ecd1be156439ff924b8 (patch)
tree284b6689e177f3fd3dce75a475e2e6ca947bb239
parente4dfe54071a9bf55a015ab260187450f7bd98b0c (diff)
downloadbraun-d0929471d049555f4d4a1ecd1be156439ff924b8.zip
braun-d0929471d049555f4d4a1ecd1be156439ff924b8.tar.gz
braun-d0929471d049555f4d4a1ecd1be156439ff924b8.tar.bz2
braun: Compatible with system as root and normal [2/9]
PD# 172209 Compatible with system as root and normal Change-Id: I834e8cb01d6d6ae7b316eed2fca23fd739402181
Diffstat
-rw-r--r--braun.mk10
-rw-r--r--device.mk5
-rw-r--r--recovery/recovery.fstab29
3 files changed, 29 insertions, 15 deletions
diff --git a/braun.mk b/braun.mk
index ec38580..5561717 100644
--- a/braun.mk
+++ b/braun.mk
@@ -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
#########################################################################
#
diff --git a/device.mk b/device.mk
index 1e626f4..b54aa5a 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/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