diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 22:27:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-02 22:27:54 +0100 |
| commit | 071359e719af26ef27ac626053e236523c5d9d2b (patch) | |
| tree | c8324635bb1b827cf61184903b17a92efa60331f /arch/arm/configs | |
| parent | ee29b84a1dfecc32925037871ed18d9af61529b4 (diff) | |
| parent | d88b6b834872d51d76a951f89c761e7b12717962 (diff) | |
| download | linux-071359e719af26ef27ac626053e236523c5d9d2b.tar.bz2 | |
Merge tag 'arm-soc/for-5.12/defconfig' of https://github.com/Broadcom/stblinux into arm/defconfig
This pull request contains Broadcom ARM-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' of https://github.com/Broadcom/stblinux:
ARM: multi_v7_defconfig: Enable nvmem's rmem driver
Link: https://lore.kernel.org/r/20210131221721.685974-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index c12b28cd470d..ec1d9f00a734 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1118,6 +1118,7 @@ CONFIG_ROCKCHIP_EFUSE=m CONFIG_NVMEM_SUNXI_SID=y CONFIG_NVMEM_VF610_OCOTP=y CONFIG_MESON_MX_EFUSE=m +CONFIG_NVMEM_RMEM=m CONFIG_FSI=m CONFIG_FSI_MASTER_GPIO=m CONFIG_FSI_MASTER_HUB=m |