diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:37 +0100 |
| commit | 61c7155c4b58294fa42b40add811834ecfecda31 (patch) | |
| tree | 6aca59465aa3de990a41b328bce57fd9ee14c42a /arch/nios2/configs/generic_defconfig | |
| parent | 6584c1f8017a4a2c1fb963bf3db3b0d4212c11a6 (diff) | |
| parent | 37d0f395b2512359ae2ce59660e52475c4c50e21 (diff) | |
| download | barebox-61c7155c4b58294fa42b40add811834ecfecda31.tar.gz barebox-61c7155c4b58294fa42b40add811834ecfecda31.tar.xz | |
Merge branch 'for-next/nios2'
Diffstat (limited to 'arch/nios2/configs/generic_defconfig')
| -rw-r--r-- | arch/nios2/configs/generic_defconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/nios2/configs/generic_defconfig b/arch/nios2/configs/generic_defconfig index 279a71ee70..5e27cc8d65 100644 --- a/arch/nios2/configs/generic_defconfig +++ b/arch/nios2/configs/generic_defconfig @@ -14,10 +14,19 @@ CONFIG_CMD_LOADENV=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y CONFIG_CMD_READLINE=y +CONFIG_CMD_TFTP=y +CONFIG_CMD_ECHO_E=y CONFIG_CMD_FLASH=y -CONFIG_CMD_BOOTM_ZLIB=y +CONFIG_CMD_BOOTM_SHOW_TYPE=y +CONFIG_CMD_BOOTM_VERBOSE=y +CONFIG_CMD_UIMAGE=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y CONFIG_CMD_TIMEOUT=y CONFIG_CMD_PARTITION=y +CONFIG_NET=y +CONFIG_NET_PING=y +CONFIG_DRIVER_NET_TSE=y CONFIG_DRIVER_CFI=y +CONFIG_FS_TFTP=y +CONFIG_ZLIB=y |