diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2022-03-08 15:38:43 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2022-06-18 04:10:35 +0000 |
| commit | 8344929bfabd53f91695929f3d53caf153b2711d (patch) | |
| tree | 3f1864d4904ae41c142b040abf0db8b86a5de842 | |
| parent | 9ded9171334a668ec9b34ce4a029c6cf659641bf (diff) | |
hikey_defconfig/hikey960_defconfig: enable CONFIG_EXT4_FS_POSIX_ACLandroid-hikey-linaro-4.14-pmwg
as it's required by the AOSP master build now.
Otherwise, it will fail to create the /data/user_de/0 directory
correctly, and cause the device not able to boot
refered to the change here:
https://android.googlesource.com/kernel/hikey-linaro/+/c5b9abcd7170324c443c375da1518b7dda70f3b1
but as there is no reccomended configurations for 4.14-stable now,
only enable CONFIG_EXT4_FS_POSIX_ACL here
Test: boot with the hikey/hikey960 builds, and wifi works
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ic86f4db5ccacc8c96158fed8fc3e0a6fe41d0700
| -rw-r--r-- | arch/arm64/configs/hikey960_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/hikey_defconfig | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm64/configs/hikey960_defconfig b/arch/arm64/configs/hikey960_defconfig index 85c1ef4dff18..1ae0862b34fa 100644 --- a/arch/arm64/configs/hikey960_defconfig +++ b/arch/arm64/configs/hikey960_defconfig @@ -555,6 +555,7 @@ CONFIG_EFI_VARS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_ACPI=y CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y CONFIG_F2FS_FS=y diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig index 080799c064e9..83e3eada042e 100644 --- a/arch/arm64/configs/hikey_defconfig +++ b/arch/arm64/configs/hikey_defconfig @@ -152,7 +152,6 @@ CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_POLICY=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y -CONFIG_NETFILTER_XT_MATCH_QTAGUID=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y CONFIG_NETFILTER_XT_MATCH_QUOTA2=y CONFIG_NETFILTER_XT_MATCH_SOCKET=y @@ -252,7 +251,6 @@ CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y -CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1 CONFIG_DM_VERITY_FEC=y CONFIG_DM_ANDROID_VERITY=y CONFIG_NETDEVICES=y @@ -293,7 +291,6 @@ CONFIG_TABLET_USB_GTCO=y CONFIG_TABLET_USB_HANWANG=y CONFIG_TABLET_USB_KBTAB=y CONFIG_INPUT_MISC=y -CONFIG_INPUT_KEYCHORD=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y CONFIG_INPUT_HISI_POWERKEY=y @@ -496,6 +493,7 @@ CONFIG_ANDROID_BINDER_IPC=y CONFIG_EFI_VARS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y CONFIG_BTRFS_FS=y @@ -539,7 +537,6 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=5 CONFIG_SCHEDSTATS=y CONFIG_ENABLE_DEFAULT_TRACERS=y -CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y @@ -550,7 +547,6 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_TWOFISH=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y |