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/A10s-OLinuXino-M_defconfig | |
parent | a26cd04920dc069fd6e91abb785426cf6c29f45f (diff) | |
download | u-boot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.tar.gz u-boot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.tar.bz2 u-boot-bd328eb38274ffaf04caaa8a6ecc09b7e19a650e.zip |
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/A10s-OLinuXino-M_defconfig')
-rw-r--r-- | configs/A10s-OLinuXino-M_defconfig | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index e7389238d9..d4953aa40b 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -1,13 +1,11 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI" -CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro" -CONFIG_MMC_SUNXI_SLOT_EXTRA=1 -CONFIG_USB1_VBUS_PIN="PB10" -CONFIG_MMC0_CD_PIN="PG1" -CONFIG_MMC1_CD_PIN="PG13" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=432 -CONFIG_DRAM_ZQ=123 -CONFIG_DRAM_EMR1=4 +CONFIG_MMC0_CD_PIN="PG1" +CONFIG_MMC1_CD_PIN="PG13" +CONFIG_MMC_SUNXI_SLOT_EXTRA=1 +CONFIG_USB1_VBUS_PIN="PB10" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI" |