summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Protsenko <semen.protsenko@linaro.org>2019-08-02 19:26:09 +0300
committerSam Protsenko <semen.protsenko@linaro.org>2019-08-22 15:52:27 +0300
commit28bdf76226904db8c391d9246b95833b9bfaadd0 (patch)
tree2aff245eb7274546b5a9f7d317f3f19855a89a0d
parentd0fdc3231d6df776125997aaba945fdec38f3467 (diff)
downloadbeagle-x15-28bdf76226904db8c391d9246b95833b9bfaadd0.tar.gz
Minor cleanups
This commit doesn't change the behavior, it only fixes coding style issues. Change-Id: I22b1baa850f50d30d386e4d2c6c0f26bc5fb665a Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
-rw-r--r--BoardConfig.mk6
-rw-r--r--fstab.beagle_x15board_v423
-rw-r--r--fstab.beagle_x15board_v523
3 files changed, 27 insertions, 25 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ad4f857..3665206 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -52,7 +52,7 @@ TARGET_BOOTLOADER_BOARD_NAME := beagle_x15board
TARGET_BOARD_PLATFORM := am57x
TARGET_COPY_OUT_VENDOR := vendor
-TARGET_RECOVERY_FSTAB = device/ti/beagle_x15/$(TARGET_FSTAB)
+TARGET_RECOVERY_FSTAB := device/ti/beagle_x15/$(TARGET_FSTAB)
TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
TARGET_RELEASETOOLS_EXTENSIONS := device/ti/beagle_x15
@@ -61,7 +61,7 @@ BOARD_SEPOLICY_DIRS += \
ifeq ($(TARGET_PRODUCT),beagle_x15_auto)
BOARD_SEPOLICY_DIRS += \
- packages/services/Car/car_product/sepolicy
+ packages/services/Car/car_product/sepolicy
DEVICE_MANIFEST_FILE += device/ti/beagle_x15/auto/manifest.xml
endif
@@ -83,6 +83,6 @@ BOARD_VENDOR_KERNEL_MODULES += $(BOARD_ALL_MODULES)
# Check if SGX kernel module is present in chosen kernel directory
SGX_KO := $(shell find $(LOCAL_KERNEL_HOME) -type f -name 'pvrsrvkm.ko')
ifeq ($(SGX_KO),)
- $(warning SGX module (pvrsrvkm.ko) not found, graphics won't work)
+ $(warning SGX module (pvrsrvkm.ko) not found, graphics will not work)
$(warning SGX module search path is: $(LOCAL_KERNEL_HOME))
endif
diff --git a/fstab.beagle_x15board_v4 b/fstab.beagle_x15board_v4
index 4eb7dc2..505e652 100644
--- a/fstab.beagle_x15board_v4
+++ b/fstab.beagle_x15board_v4
@@ -1,13 +1,14 @@
# Android fstab file for kernel v4.x
-# <src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+#
+# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot
+# specify 'check', and must come before any filesystems that do specify 'check'
-/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev wait,check,quota
-/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery /recovery emmc defaults defaults
-/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/boot /boot emmc defaults defaults
-/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/misc /misc emmc defaults defaults
-
-/devices/platform/44000000.ocp/488c0000.omap_dwc3_2/488d0000.usb* auto auto defaults voldmanaged=usb0:auto
-/devices/platform/44000000.ocp/48880000.omap_dwc3_1/48890000.usb* auto auto defaults voldmanaged=usb1:auto
-/devices/platform/44000000.ocp/4809c000.mmc/mmc_host* auto auto defaults voldmanaged=sdcard1:auto
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev wait,check,quota
+/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery /recovery emmc defaults defaults
+/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/boot /boot emmc defaults defaults
+/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/misc /misc emmc defaults defaults
+# USB / SD card
+/devices/platform/44000000.ocp/488c0000.omap_dwc3_2/488d0000.usb* auto auto defaults voldmanaged=usb0:auto
+/devices/platform/44000000.ocp/48880000.omap_dwc3_1/48890000.usb* auto auto defaults voldmanaged=usb1:auto
+/devices/platform/44000000.ocp/4809c000.mmc/mmc_host* auto auto defaults voldmanaged=sdcard1:auto
diff --git a/fstab.beagle_x15board_v5 b/fstab.beagle_x15board_v5
index fdf0fc6..8b8ab10 100644
--- a/fstab.beagle_x15board_v5
+++ b/fstab.beagle_x15board_v5
@@ -1,13 +1,14 @@
# Android fstab file for kernel v5.0+
-# <src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+#
+# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot
+# specify 'check', and must come before any filesystems that do specify 'check'
-/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev wait,check,quota
-/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/recovery /recovery emmc defaults defaults
-/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/boot /boot emmc defaults defaults
-/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/misc /misc emmc defaults defaults
-
-/devices/platform/48800000.interconnect/48800000.interconnect:segment@0/488c0000.target-module/488c0000.omap_dwc3_2/488d0000.usb* auto auto defaults voldmanaged=usb0:auto
-/devices/platform/48800000.interconnect/48800000.interconnect:segment@0/48880000.target-module/48880000.omap_dwc3_1/48890000.usb* auto auto defaults voldmanaged=usb1:auto
-/devices/platform/48000000.interconnect/48000000.interconnect:segment@0/4809c000.target-module/4809c000.mmc/mmc_host* auto auto defaults voldmanaged=sdcard1:auto
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/userdata /data ext4 noatime,nosuid,nodev wait,check,quota
+/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/recovery /recovery emmc defaults defaults
+/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/boot /boot emmc defaults defaults
+/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/misc /misc emmc defaults defaults
+# USB / SD card
+/devices/platform/48800000.interconnect/48800000.interconnect:segment@0/488c0000.target-module/488c0000.omap_dwc3_2/488d0000.usb* auto auto defaults voldmanaged=usb0:auto
+/devices/platform/48800000.interconnect/48800000.interconnect:segment@0/48880000.target-module/48880000.omap_dwc3_1/48890000.usb* auto auto defaults voldmanaged=usb1:auto
+/devices/platform/48000000.interconnect/48000000.interconnect:segment@0/4809c000.target-module/4809c000.mmc/mmc_host* auto auto defaults voldmanaged=sdcard1:auto