kernel logo: default disable CONFIG_LOGO

because most projects use uboot logo display at kenel, so default
disable kernel logo.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

diff --git a/arch/arm/configs/rk3036_defconfig b/arch/arm/configs/rk3036_defconfig
index c292299f04b3b0bf8829fb8ce4cc91f7f09923b5..21fd6a380757a04453f3e06380fbd1f08df3e12d 100644 (file)
--- a/arch/arm/configs/rk3036_defconfig
+++ b/arch/arm/configs/rk3036_defconfig
@@ -244,9 +244,6 @@ CONFIG_RK32_DP=y
 CONFIG_RK_HDMI=y
 CONFIG_RK_TVENCODER=y
 CONFIG_RK3036_TV_ENCODER=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index f5dd5ff8c7608c7b5a90c8ac7bae9a427d9cade8..44ade9ccc0eae7b2dfdb1cf0d3a7b6f4e5b42f4e 100644 (file)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -423,9 +423,6 @@ CONFIG_RK_TVENCODER=y
 CONFIG_RK3036_TV_ENCODER=y
 CONFIG_ROCKCHIP_RGA=y
 CONFIG_ROCKCHIP_RGA2=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set