Skip to content

Commit

Permalink
configs: Add CONFIG_EXT4_ENCRYPTION=y
Browse files Browse the repository at this point in the history 
Enable EXT4 encryption support for all configurations except those
based on the original BCM2835, i.e. not on B+, Zero, etc. This
exception is because it would consume at least an additional 68KB,
which is a lot on a platform that may only have 128MB.

See: #2486

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  • Loading branch information
@pelwell @popcornmix
pelwell authored and popcornmix committed Apr 7, 2020
1 parent cb0cf96 commit 3712e12
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
4 changes: 1 addition & 3 deletions arch/arm/configs/bcm2709_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,7 @@ CONFIG_RPI_AXIPERF=m
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_POSIX_ACL=y
Expand Down Expand Up @@ -1412,9 +1413,6 @@ CONFIG_NLS_KOI8_U=m
CONFIG_DLM=m
# CONFIG_SECURITYFS is not set
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
Expand Down
4 changes: 1 addition & 3 deletions arch/arm/configs/bcm2711_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1300,6 +1300,7 @@ CONFIG_RPI_AXIPERF=m
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_POSIX_ACL=y
Expand Down Expand Up @@ -1410,9 +1411,6 @@ CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_DLM=m
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
Expand Down
4 changes: 1 addition & 3 deletions arch/arm64/configs/bcm2711_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,7 @@ CONFIG_RPI_AXIPERF=m
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_POSIX_ACL=y
Expand Down Expand Up @@ -1437,9 +1438,6 @@ CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_DLM=m
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
Expand Down
4 changes: 1 addition & 3 deletions arch/arm64/configs/bcmrpi3_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,7 @@ CONFIG_PWM_PCA9685=m
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_POSIX_ACL=y
Expand Down Expand Up @@ -1244,9 +1245,6 @@ CONFIG_NLS_KOI8_U=m
CONFIG_DLM=m
# CONFIG_SECURITYFS is not set
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CTS=m
CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_XCBC=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
Expand Down

0 comments on commit 3712e12

Please sign in to comment.