summaryrefslogtreecommitdiff
path: root/include/configs/bfin_adi_common.h
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-06-22 16:15:30 -0500
committerTom Rini <trini@konsulko.com>2015-06-25 22:18:34 -0400
commitef0f2f57524ec85fb9058a23298f2c4995e0d950 (patch)
treecaaacebea68c43e02224afa84e10c702f11cc8d8 /include/configs/bfin_adi_common.h
parentc9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (diff)
Move defaults from config_cmd_default.h to Kconfig
This sets the default commands Kconfig to match include/config_cmd_default.h commands in the common/Kconfig and removes them from include/configs. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/bfin_adi_common.h')
-rw-r--r--include/configs/bfin_adi_common.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 1c9d584578..7b2faf29cb 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -9,7 +9,6 @@
* Command Settings
*/
#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
# ifdef ADI_CMDS_NETWORK
# define CONFIG_CMD_DHCP
# define CONFIG_BOOTP_SUBNETMASK
@@ -23,9 +22,6 @@
# ifdef CONFIG_BFIN_MAC
# define CONFIG_CMD_MII
# endif
-# else
-# undef CONFIG_CMD_BOOTD
-# undef CONFIG_CMD_NFS
# endif
# ifdef CONFIG_LIBATA
# define CONFIG_CMD_FAT
@@ -75,10 +71,7 @@
# define CONFIG_CMD_I2C
# define CONFIG_SOFT_I2C_READ_REPEATED_START
# endif
-# ifdef CONFIG_SYS_NO_FLASH
-# undef CONFIG_CMD_FLASH
-# undef CONFIG_CMD_IMLS
-# else
+# ifndef CONFIG_SYS_NO_FLASH
# define CONFIG_CMD_JFFS2
# endif
# ifdef CONFIG_CMD_JFFS2