diff options
| author | Tom Rini <trini@ti.com> | 2014-11-27 13:10:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-27 13:10:04 -0500 |
| commit | e17e998d7fee2e7d381b7bff21aca3714387d5d7 (patch) | |
| tree | 082fb0e66aa0463886d18294f0e29504626019a6 /include/configs | |
| parent | 38cd8c4253013ccdd4052ee021f6066fe9a52551 (diff) | |
| parent | 25e274e20208e047ea93afde04040e8c87430904 (diff) | |
| download | u-boot-imx-e17e998d7fee2e7d381b7bff21aca3714387d5d7.zip u-boot-imx-e17e998d7fee2e7d381b7bff21aca3714387d5d7.tar.gz u-boot-imx-e17e998d7fee2e7d381b7bff21aca3714387d5d7.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/uniphier-common.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/configs/uniphier-common.h b/include/configs/uniphier-common.h index 7c4dba0..2140fcc 100644 --- a/include/configs/uniphier-common.h +++ b/include/configs/uniphier-common.h @@ -112,7 +112,6 @@ are defined. Select only one of them." #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_CMDLINE_EDITING /* add command line history */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) @@ -143,15 +142,6 @@ are defined. Select only one of them." */ #define CONFIG_ARP_TIMEOUT 500UL /* 0.5 msec */ -/* - * Command line configuration. - */ -#include <config_cmd_default.h> - -#define CONFIG_CMD_PING -#define CONFIG_CMD_TIME -#define CONFIG_CMD_NAND /* NAND flash suppport */ - #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 2 #define CONFIG_SYS_NAND_ONFI_DETECTION @@ -167,7 +157,6 @@ are defined. Select only one of them." #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 /* USB */ -#define CONFIG_CMD_USB #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_CMD_FAT #define CONFIG_FAT_WRITE @@ -225,10 +214,6 @@ are defined. Select only one of them." "add_default_bootargs=setenv bootargs $bootargs" \ " console=ttyS0,$baudrate\0" \ -/* FIT support */ -#define CONFIG_FIT -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ - /* Open Firmware flat tree */ #define CONFIG_OF_LIBFDT |