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/colibri_vf_defconfig | |
| parent | 54e0f96f764f662be186baae7d6c2c97423bc29d (diff) | |
| parent | f3edfd30541d6f245d7dfa6fa7354cc916cc53e1 (diff) | |
| download | u-boot-1254ff97abb7606ccd0d7bdcd9f22581c50fe535.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'configs/colibri_vf_defconfig')
| -rw-r--r-- | configs/colibri_vf_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 5d4f30756d..ffb3b4fd85 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -1,7 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_COLIBRI_VF=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND" -CONFIG_CMD_NET=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_DM=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y -CONFIG_DM=y |