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/am335x_evm_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'configs/am335x_evm_defconfig') diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 968d0418eb..f23c0e33e3 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -1,7 +1,6 @@ +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="NAND" -CONFIG_CONS_INDEX=1 -CONFIG_ARM=y -CONFIG_TARGET_AM335X_EVM=y -- cgit v1.2.1