diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-08 08:37:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-08 08:37:02 -0400 |
| commit | 4d80051b63ff54f6b6f90fceb92cf87ab3401ecb (patch) | |
| tree | aea5bee67c756558fc8c820b4ee04adb75c85146 /configs | |
| parent | 5bcec545a6ca977ad74ee9fe0f2b335d348b5000 (diff) | |
| parent | 943a3f2ccb71bcb4a6041bc2946129c4d4bb197e (diff) | |
| download | talos-obmc-uboot-4d80051b63ff54f6b6f90fceb92cf87ab3401ecb.tar.gz talos-obmc-uboot-4d80051b63ff54f6b6f90fceb92cf87ab3401ecb.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/colibri_vf_defconfig | 1 | ||||
| -rw-r--r-- | configs/colibri_vf_dtb_defconfig | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index b2d1ed803f..5d4f30756d 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_I CONFIG_CMD_NET=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y +CONFIG_DM=y diff --git a/configs/colibri_vf_dtb_defconfig b/configs/colibri_vf_dtb_defconfig new file mode 100644 index 0000000000..d4c8c58d6b --- /dev/null +++ b/configs/colibri_vf_dtb_defconfig @@ -0,0 +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_NAND_VF610_NFC=y +CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y +CONFIG_DM=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" |
