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/Mele_M5_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/Mele_M5_defconfig')
| -rw-r--r-- | configs/Mele_M5_defconfig | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig index 78fba71d9a..5ee648b655 100644 --- a/configs/Mele_M5_defconfig +++ b/configs/Mele_M5_defconfig @@ -1,14 +1,10 @@ -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234" -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5" -CONFIG_VIDEO_HDMI=y -CONFIG_MMC0_CD_PIN="PH1" -CONFIG_USB1_VBUS_PIN="PH6" -CONFIG_USB2_VBUS_PIN="PH3" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 CONFIG_DRAM_ZQ=122 -CONFIG_DRAM_EMR1=4 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5" +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234" CONFIG_ETH_DESIGNWARE=y |