From bd328eb38274ffaf04caaa8a6ecc09b7e19a650e Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Tue, 12 May 2015 14:46:24 -0500 Subject: Clean all defconfigs with savedefconfig In order to reduce merge conflicts and to maintain the simplest possible defconfig files, we should be using the savedefconfig feature of Kconfig every time a new feature is added. This keeps the defconfig settings to a minimum (only those things not default) and keeps them in the same order as the Kconfig options. Signed-off-by: Joe Hershberger Cc: Masahiro Yamada Acked-by: Stephen Warren Cc: Tom Rini --- configs/iNet_3F_defconfig | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'configs/iNet_3F_defconfig') diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig index 0ae11a7904..e807aebd41 100644 --- a/configs/iNet_3F_defconfig +++ b/configs/iNet_3F_defconfig @@ -1,20 +1,17 @@ -# The iNet 3F is an A10 tablet with 1GiB RAM and a 1024x768 screen. -# Also see: http://linux-sunxi.org/INet_3F -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN4I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_EMR1=4 CONFIG_MMC0_CD_PIN="PH1" -CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:18,pclk_khz:100000,le:799,ri:260,up:15,lo:16,hs:1,vs:1,sync:3,vmode:0" -CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_VIDEO_LCD_POWER="PH8" CONFIG_VIDEO_LCD_BL_EN="PH7" CONFIG_VIDEO_LCD_BL_PWM="PB2" -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_MACH_SUN4I=y -CONFIG_DRAM_CLK=432 -CONFIG_DRAM_ZQ=123 -CONFIG_DRAM_EMR1=4 +CONFIG_VIDEO_LCD_PANEL_LVDS=y +CONFIG_USB_MUSB_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -- cgit