From 216f7ce88fe6a86a8abef2969d2d710f2883a245 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 10 Jul 2020 09:16:49 +0800 Subject: [PATCH] Kconfig: move CONFIG_BASE_DEFCONFIG to rockchip Kconfig Signed-off-by: Joseph Chen Change-Id: Ibae643de69aa59b8da048286fde2d736d570272d --- Kconfig | 6 ------ arch/arm/mach-rockchip/Kconfig | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Kconfig b/Kconfig index 081a743321..1d3c0e2c88 100644 --- a/Kconfig +++ b/Kconfig @@ -59,12 +59,6 @@ config CC_OPTIMIZE_FOR_SIZE This option is enabled by default for U-Boot. -config BASE_DEFCONFIG - string "Base defconfig of config fragment" - default "" - help - Indicate the base defconfig of config fragment. - config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index eaa2ebff8f..47329e42e3 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -741,6 +741,12 @@ config ROCKCHIP_UART_MUX_SEL_M help This select uart multiplexer for debug uart iomux in board_debug_uart_init. +config BASE_DEFCONFIG + string "Base defconfig of config fragment" + default "" + help + Indicate the base defconfig of config fragment. + config GICV2 bool "ARM GICv2"