diff options
| author | Tom Rini | 2019-02-02 10:11:20 -0500 |
|---|---|---|
| committer | Tom Rini | 2019-02-02 10:11:20 -0500 |
| commit | e5fd39c886485e3dec77f4438a6e364c2987cf5f (patch) | |
| tree | 635a4987f759207efd147ff628d683f7389ab1a1 /configs/rock2_defconfig | |
| parent | 544d5e98f3657e4ac1966be8971586aa42dad8c4 (diff) | |
| parent | 73ced87e9af70cba35c4374055dca56e5f9c460d (diff) | |
Merge tag 'for-master-20190201' of git://git.denx.de/u-boot-rockchip
u-boot-rockchip changes for 2019.04-rc1:
* support for Chromebook Bob
* full pinctrl driver using DTS properties
* documentation improvements
* I2S support for some Rockchip SoCs
Diffstat (limited to 'configs/rock2_defconfig')
| -rw-r--r-- | configs/rock2_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 702e8e91cb6..a5faa8fb958 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -56,8 +56,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -# CONFIG_SPL_PINCTRL_FULL is not set -CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_PMIC_ACT8846=y |