Merge branch 'master' into next

[platform/kernel/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c51f15f..f0118e2 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1956,7 +1956,8 @@ config ARCH_ROCKCHIP
        imply ADC
        imply CMD_DM
        imply DEBUG_UART_BOARD_INIT
-       imply DISTRO_DEFAULTS
+       imply DISTRO_DEFAULTS if !ROCKCHIP_RK3399
+       imply BOOTSTD_DEFAULTS if !DISTRO_DEFAULTS
        imply FAT_WRITE
        imply SARADC_ROCKCHIP
        imply SPL_SYSRESET