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/Ainol_AW1_defconfig | |
parent | a26cd04920dc069fd6e91abb785426cf6c29f45f (diff) | |
download | u-boot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.tar.gz |
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/Ainol_AW1_defconfig')
-rw-r--r-- | configs/Ainol_AW1_defconfig | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig index ff41444151..94c5443b21 100644 --- a/configs/Ainol_AW1_defconfig +++ b/configs/Ainol_AW1_defconfig @@ -1,13 +1,9 @@ -# The Ainol AW1 is an A20 based tablet with a 800x480 lcd screen, sdio wifi, -# volume up/down and home buttons, micro-sd slot, micro usb (otg), headphones -# connector and a SPCI modem connector. -# -# Also see: http://linux-sunxi.org/Ainol_AW1 -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=432 +CONFIG_DRAM_ZQ=123 CONFIG_MMC0_CD_PIN="PH1" -CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" CONFIG_AXP_GPIO=y @@ -15,9 +11,7 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo 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_SUN7I=y -CONFIG_DRAM_CLK=432 -CONFIG_DRAM_ZQ=123 -CONFIG_DRAM_EMR1=4 +CONFIG_USB_MUSB_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" |