Merge tag 'arm-soc/for-5.12/defconfig-arm64' of...

Merge tag 'arm-soc/for-5.12/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig

This pull request contains Broadcom ARM64-based SoCs defconfig updates for
5.12, please pull the following:

- Nicolas enables the NVMEM reserved memory driver to permit reading the
  Raspberry Pi's bootloader configuration from user-space

* tag 'arm-soc/for-5.12/defconfig-arm64' of https://github.com/Broadcom/stblinux:
  arm64: defconfig: Enable nvmem's rmem driver

Link: https://lore.kernel.org/r/20210131221721.685974-2-f.fainelli@gmail.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

arch/arm64/configs/defconfig

@@ -1064,6 +1064,7 @@ CONFIG_ROCKCHIP_EFUSE=y
 CONFIG_NVMEM_SUNXI_SID=y
 CONFIG_UNIPHIER_EFUSE=y
 CONFIG_MESON_EFUSE=m
+CONFIG_NVMEM_RMEM=m
 CONFIG_FPGA=y
 CONFIG_FPGA_MGR_STRATIX10_SOC=m
 CONFIG_FPGA_BRIDGE=m