diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-05-12 14:46:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-12 18:10:26 -0400 |
| commit | bd328eb38274ffaf04caaa8a6ecc09b7e19a650e (patch) | |
| tree | 4326731b4b7fa3187bba919e10bbd2187c5c8781 /configs/A13-OLinuXinoM_defconfig | |
| parent | a26cd04920dc069fd6e91abb785426cf6c29f45f (diff) | |
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 <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/A13-OLinuXinoM_defconfig')
| -rw-r--r-- | configs/A13-OLinuXinoM_defconfig | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index f558a6cf947..4bee3627079 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -1,18 +1,15 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI" -CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_EMR1=0 CONFIG_USB1_VBUS_PIN="PG11" -CONFIG_VIDEO_HDMI=n +# CONFIG_VIDEO_HDMI is not set CONFIG_VIDEO_VGA_VIA_LCD=y CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y -# For use with the Olimex 7" LCD module, adjust timings for other displays -# Set video-mode=sunxi:800x600-24@60,monitor=lcd in the env. to enable CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0" CONFIG_VIDEO_LCD_POWER="PB10" CONFIG_VIDEO_LCD_BL_PWM="PB2" -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_MACH_SUN5I=y -CONFIG_DRAM_CLK=408 -CONFIG_DRAM_ZQ=123 -CONFIG_DRAM_EMR1=0 +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI" |