[LOCAL] arm64: renesas: defconfig: Refresh for v5.9-rc1

Commit Message

Geert Uytterhoeven Nov. 3, 2020, 8:42 a.m. UTC

Refresh the defconfig for Renesas R-Car Gen3 and RZ/G2 systems:
  - Drop CONFIG_SECCOMP=y (auto-enabled since commit 282a181b1a0d66de
    ("seccomp: Move config option SECCOMP to arch/Kconfig")),
  - Disable CONFIG_ARM64_MTE (R-Car Gen3 is not ARMv8.5),
  - Move CONFIG_MDIO_BUS_MUX_MMIOREG=y (moved by commit a9770eac511ad823
    ("net: mdio: Move MDIO drivers into a new subdirectory")),
  - Reorder SoC-specific config options (cfr. commit 6d5aded8d57fc032
    ("soc: renesas: Sort driver description title")),
  - Drop CONFIG_CRYPTO_DEV_VIRTIO=n (no longer auto-enabled since commit
    b1a5c9a620f2b179 ("crypto: virtio - don't use 'default m'")).

Signed-off-by: Geert Uytterhoeven <[e-mail]>
---
Not intended for upstream merge.
To be applied to topic/renesas-defconfig.
---
 arch/arm64/configs/renesas_defconfig | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Patch

diff --git a/arch/arm64/configs/renesas_defconfig b/arch/arm64/configs/renesas_defconfig
index 7e42e587dedda870..71a6cb34ca89229c 100644
--- a/arch/arm64/configs/renesas_defconfig
+++ b/arch/arm64/configs/renesas_defconfig
@@ -41,7 +41,6 @@  CONFIG_ARCH_RENESAS=y
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=8
-CONFIG_SECCOMP=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 CONFIG_XEN=y
@@ -54,6 +53,7 @@  CONFIG_COMPAT=y
 # CONFIG_ARM64_BTI is not set
 # CONFIG_ARM64_E0PD is not set
 # CONFIG_ARCH_RANDOM is not set
+# CONFIG_ARM64_MTE is not set
 CONFIG_HIBERNATION=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_CPU_IDLE=y
@@ -128,9 +128,9 @@  CONFIG_TUN=y
 CONFIG_VIRTIO_NET=y
 CONFIG_SH_ETH=y
 CONFIG_RAVB=y
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_MICREL_PHY=y
 CONFIG_REALTEK_PHY=y
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_WLCORE=y
 CONFIG_WLCORE_SDIO=y
 CONFIG_INPUT_MATRIXKMAP=y
@@ -309,20 +309,20 @@  CONFIG_HWSPINLOCK=y
 # CONFIG_ARM64_ERRATUM_858921 is not set
 CONFIG_MAILBOX=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
-CONFIG_ARCH_R8A774A1=y
-CONFIG_ARCH_R8A774B1=y
-CONFIG_ARCH_R8A774C0=y
-CONFIG_ARCH_R8A774E1=y
+CONFIG_ARCH_R8A77995=y
+CONFIG_ARCH_R8A77990=y
 CONFIG_ARCH_R8A77950=y
 CONFIG_ARCH_R8A77951=y
+CONFIG_ARCH_R8A77965=y
 CONFIG_ARCH_R8A77960=y
 CONFIG_ARCH_R8A77961=y
-CONFIG_ARCH_R8A77965=y
-CONFIG_ARCH_R8A77970=y
 CONFIG_ARCH_R8A77980=y
-CONFIG_ARCH_R8A77990=y
-CONFIG_ARCH_R8A77995=y
+CONFIG_ARCH_R8A77970=y
 CONFIG_ARCH_R8A779A0=y
+CONFIG_ARCH_R8A774C0=y
+CONFIG_ARCH_R8A774E1=y
+CONFIG_ARCH_R8A774A1=y
+CONFIG_ARCH_R8A774B1=y
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_MEMORY=y
 CONFIG_RENESAS_RPCIF=y
@@ -352,7 +352,6 @@  CONFIG_ROOT_NFS=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
-# CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DEV_CCREE=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_SIZE_MBYTES=128