diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 22:29:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 22:29:10 +0100 |
| commit | c0ec73899d43dfe2600b9b2a5c130401a907c98a (patch) | |
| tree | c1d9601142666a55149ae483591865d5340b2ecd /arch/arm64/configs | |
| parent | 071359e719af26ef27ac626053e236523c5d9d2b (diff) | |
| parent | 2a9e89e6a694cb01ff19b8ffd6fceb46b824f1a9 (diff) | |
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.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 92cb8eedf1f1..9d643aa956b4 100644 --- a/arch/arm64/configs/defconfig +++ b/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 |