From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 24 Mar 2014 06:16:43 +0000 (+0800)
Subject: ARM: rockchip: update rockchip_defconfig by savedefconfig
X-Git-Tag: firefly_0821_release~5876
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ffcfba1c6da0385f84b2d70c19d5cf3c1db63544;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: update rockchip_defconfig by savedefconfig
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 530c0485fa40..ccfd533fe979 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -33,10 +33,6 @@ CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_MSDOS_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_EFI_PARTITION is not set
-CONFIG_EFI_PARTITION=y
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_720789=y
@@ -359,7 +355,6 @@ CONFIG_DP_ANX6345=y
 CONFIG_RK32_DP=y
 CONFIG_RK_HDMI=y
 CONFIG_ROCKCHIP_RGA2=y
-CONFIG_IEP=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -468,7 +463,6 @@ CONFIG_DWC_OTG_310=y
 CONFIG_USB20_HOST=y
 CONFIG_USB20_OTG=y
 CONFIG_MMC=y
-# CONFIG_MMC_CLKGATE is not set
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_MMC_BLOCK_MINORS=32
 # CONFIG_MMC_BLOCK_BOUNCE is not set