diff --git a/device/rockchip/common/config.fs b/device/rockchip/common/config.fs new file mode 100644 index 00000000000..bf40022f452 --- /dev/null +++ b/device/rockchip/common/config.fs @@ -0,0 +1,30 @@ +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This file is used to define the properties of the filesystem +# images generated by build tools (mkbootfs and mkyaffs2image) and +# by the device side of adb. + +[sbin/parted] +mode: 0755 +user: AID_ROOT +group: AID_ROOT +caps: SYS_ADMIN + +[sbin/sfdisk] +mode: 0755 +user: AID_ROOT +group: AID_ROOT +caps: SYS_ADMIN diff --git a/device/rockchip/rk356x/nanopi5/BoardConfig.mk b/device/rockchip/rk356x/nanopi5/BoardConfig.mk index 015eefe75ef..f9a818176b4 100644 --- a/device/rockchip/rk356x/nanopi5/BoardConfig.mk +++ b/device/rockchip/rk356x/nanopi5/BoardConfig.mk @@ -47,6 +47,7 @@ BOARD_PREBUILT_DTBIMAGE_DIR := BOARD_INCLUDE_RECOVERY_DTBO := BOARD_PREBUILT_DTBOIMAGE := device/rockchip/rk356x/nanopi5/dtbo.img TARGET_RECOVERY_FSTAB := device/rockchip/rk356x/nanopi5/recovery.fstab +TARGET_FS_CONFIG_GEN := device/rockchip/common/config.fs BOARD_CACHEIMAGE_PARTITION_SIZE := 281018368 BOARD_SUPER_PARTITION_SIZE := 2684354560 diff --git a/device/rockchip/rk356x/nanopi5_box/BoardConfig.mk b/device/rockchip/rk356x/nanopi5_box/BoardConfig.mk index f0e6ac55239..69fc8049ada 100644 --- a/device/rockchip/rk356x/nanopi5_box/BoardConfig.mk +++ b/device/rockchip/rk356x/nanopi5_box/BoardConfig.mk @@ -50,6 +50,7 @@ BOARD_PREBUILT_DTBIMAGE_DIR := BOARD_INCLUDE_RECOVERY_DTBO := BOARD_PREBUILT_DTBOIMAGE := device/rockchip/rk356x/nanopi5_box/dtbo.img TARGET_RECOVERY_FSTAB := device/rockchip/rk356x/nanopi5_box/recovery.fstab +TARGET_FS_CONFIG_GEN := device/rockchip/common/config.fs BOARD_CACHEIMAGE_PARTITION_SIZE := 281018368 BOARD_SUPER_PARTITION_SIZE := 2684354560 diff --git a/device/rockchip/rk3576/nanopim5/BoardConfig.mk b/device/rockchip/rk3576/nanopim5/BoardConfig.mk index f416d561bd5..5d202a260d4 100644 --- a/device/rockchip/rk3576/nanopim5/BoardConfig.mk +++ b/device/rockchip/rk3576/nanopim5/BoardConfig.mk @@ -46,6 +46,7 @@ BOARD_PREBUILT_DTBIMAGE_DIR := BOARD_INCLUDE_RECOVERY_DTBO := BOARD_PREBUILT_DTBOIMAGE := device/rockchip/rk3576/nanopim5/dtbo.img TARGET_RECOVERY_FSTAB := device/rockchip/rk3576/nanopim5/recovery.fstab +TARGET_FS_CONFIG_GEN := device/rockchip/common/config.fs BOARD_CACHEIMAGE_PARTITION_SIZE := 281018368 BOARD_SUPER_PARTITION_SIZE := 2684354560 diff --git a/device/rockchip/rk3576/nanopim5_box/BoardConfig.mk b/device/rockchip/rk3576/nanopim5_box/BoardConfig.mk index c109a62f74b..f8632124fa7 100644 --- a/device/rockchip/rk3576/nanopim5_box/BoardConfig.mk +++ b/device/rockchip/rk3576/nanopim5_box/BoardConfig.mk @@ -50,6 +50,7 @@ BOARD_PREBUILT_DTBIMAGE_DIR := BOARD_INCLUDE_RECOVERY_DTBO := BOARD_PREBUILT_DTBOIMAGE := device/rockchip/rk3576/nanopim5_box/dtbo.img TARGET_RECOVERY_FSTAB := device/rockchip/rk3576/nanopim5_box/recovery.fstab +TARGET_FS_CONFIG_GEN := device/rockchip/common/config.fs BOARD_CACHEIMAGE_PARTITION_SIZE := 281018368 BOARD_SUPER_PARTITION_SIZE := 2684354560 diff --git a/device/rockchip/rk3588/nanopi6/BoardConfig.mk b/device/rockchip/rk3588/nanopi6/BoardConfig.mk index 045b99d48f3..38fb07d44c9 100644 --- a/device/rockchip/rk3588/nanopi6/BoardConfig.mk +++ b/device/rockchip/rk3588/nanopi6/BoardConfig.mk @@ -48,6 +48,7 @@ BOARD_PREBUILT_DTBIMAGE_DIR := BOARD_INCLUDE_RECOVERY_DTBO := BOARD_PREBUILT_DTBOIMAGE := device/rockchip/rk3588/nanopi6/dtbo.img TARGET_RECOVERY_FSTAB := device/rockchip/rk3588/nanopi6/recovery.fstab +TARGET_FS_CONFIG_GEN := device/rockchip/common/config.fs BOARD_CACHEIMAGE_PARTITION_SIZE := 281018368 BOARD_SUPER_PARTITION_SIZE := 2684354560 diff --git a/device/rockchip/rk3588/nanopi6_box/BoardConfig.mk b/device/rockchip/rk3588/nanopi6_box/BoardConfig.mk index e92a250fc14..aaff5f237a0 100644 --- a/device/rockchip/rk3588/nanopi6_box/BoardConfig.mk +++ b/device/rockchip/rk3588/nanopi6_box/BoardConfig.mk @@ -53,6 +53,7 @@ BOARD_PREBUILT_DTBIMAGE_DIR := BOARD_INCLUDE_RECOVERY_DTBO := BOARD_PREBUILT_DTBOIMAGE := device/rockchip/rk3588/nanopi6_box/dtbo.img TARGET_RECOVERY_FSTAB := device/rockchip/rk3588/nanopi6_box/recovery.fstab +TARGET_FS_CONFIG_GEN := device/rockchip/common/config.fs BOARD_CACHEIMAGE_PARTITION_SIZE := 281018368 BOARD_SUPER_PARTITION_SIZE := 2684354560