diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-06-22 16:15:30 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-25 22:18:34 -0400 |
| commit | ef0f2f57524ec85fb9058a23298f2c4995e0d950 (patch) | |
| tree | caaacebea68c43e02224afa84e10c702f11cc8d8 /include/configs/microblaze-generic.h | |
| parent | c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (diff) | |
| download | talos-obmc-uboot-ef0f2f57524ec85fb9058a23298f2c4995e0d950.tar.gz talos-obmc-uboot-ef0f2f57524ec85fb9058a23298f2c4995e0d950.zip | |
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/microblaze-generic.h')
| -rw-r--r-- | include/configs/microblaze-generic.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index faa13e330c..e16965c56c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -244,12 +244,9 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_IRQ #define CONFIG_CMD_MFSL -#define CONFIG_CMD_ECHO #define CONFIG_CMD_GPIO #if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE) @@ -258,9 +255,7 @@ # undef CONFIG_CMD_CACHE #endif -#ifndef CONFIG_SYS_ENET -# undef CONFIG_CMD_NFS -#else +#ifdef CONFIG_SYS_ENET # define CONFIG_CMD_PING # define CONFIG_CMD_DHCP # define CONFIG_CMD_TFTPPUT @@ -272,15 +267,11 @@ #endif #if defined(FLASH) -# define CONFIG_CMD_ECHO -# define CONFIG_CMD_FLASH -# define CONFIG_CMD_IMLS # define CONFIG_CMD_JFFS2 # define CONFIG_CMD_UBI # undef CONFIG_CMD_UBIFS # if !defined(RAMENV) -# define CONFIG_CMD_SAVEENV # define CONFIG_CMD_SAVES # endif @@ -289,12 +280,9 @@ # define CONFIG_CMD_SF # if !defined(RAMENV) -# define CONFIG_CMD_SAVEENV # define CONFIG_CMD_SAVES # endif #else -# undef CONFIG_CMD_IMLS -# undef CONFIG_CMD_FLASH # undef CONFIG_CMD_JFFS2 # undef CONFIG_CMD_UBI # undef CONFIG_CMD_UBIFS |
