From bb50c81be9bf699fb59734738d0a1adcf66c7615 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 16 Sep 2014 20:01:51 +0800 Subject: [PATCH] ARM: rockchip: rockchip_defconfig: update by savedefconfig and remove unused ethernet config --- arch/arm/configs/rockchip_defconfig | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig index 3f10aefc66bc..280e49abed3d 100644 --- a/arch/arm/configs/rockchip_defconfig +++ b/arch/arm/configs/rockchip_defconfig @@ -234,6 +234,19 @@ CONFIG_DM_UEVENT=y CONFIG_DM_VERITY=y CONFIG_NETDEVICES=y CONFIG_TUN=y +# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_WIZNET is not set CONFIG_RK_GMAC_ETH=y CONFIG_PPP=y CONFIG_PPP_BSDCOMP=y @@ -367,10 +380,6 @@ CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_GC0308=y -CONFIG_GC0329=y -CONFIG_GC2035=y -CONFIG_OV2659=y CONFIG_MALI_MIDGARD=m CONFIG_MALI_MIDGARD_DVFS=y CONFIG_MALI_MIDGARD_RT_PM=y @@ -528,7 +537,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_SWITCH=y CONFIG_RTC_CLASS=y CONFIG_RTC_HYM8563=y -CONFIG_RK808_RTC=y CONFIG_RTC_RT5036=y CONFIG_RTC_DRV_RC5T619=y CONFIG_STAGING=y -- 2.34.1