diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:21:44 +0200 |
| commit | 1254ff97abb7606ccd0d7bdcd9f22581c50fe535 (patch) | |
| tree | 61b31e61173154abd38aaa6584e84ea77314b861 /configs/x600_defconfig | |
| parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
| parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
| download | u-boot-imx-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.zip u-boot-imx-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.gz u-boot-imx-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'configs/x600_defconfig')
| -rw-r--r-- | configs/x600_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 8e22a18..fdd4d3b 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -1,9 +1,9 @@ CONFIG_ARM=y CONFIG_TARGET_X600=y -CONFIG_NETDEVICES=y -CONFIG_CMD_NET=y CONFIG_SPL=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n" CONFIG_AUTOBOOT_STOP_STR=" " +# CONFIG_CMD_SETEXPR is not set +CONFIG_NETDEVICES=y CONFIG_ETH_DESIGNWARE=y |