diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-04 19:58:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-04 19:58:09 -0400 |
| commit | 2dc426418f275a934178df41905fabe6f7cfac95 (patch) | |
| tree | d15f8b1e029b94bf1decda3b675c01625b7bfced /include/configs/colibri_imx6.h | |
| parent | 4862830b696a6d0750e19d32a82553cdb41a85f8 (diff) | |
| parent | 7225a27ffae5d1119eb25b6b9c9e091a852e6b13 (diff) | |
Merge branch '2019-05-04-master-imports'
- Remove dead code from davinci
- Migrate CONFIG_SUPPORT_EMMC_BOOT
Diffstat (limited to 'include/configs/colibri_imx6.h')
| -rw-r--r-- | include/configs/colibri_imx6.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 129a42466d..b540b3e074 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -44,8 +44,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 -#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ - /* Network */ #define CONFIG_FEC_MXC #define IMX_FEC_BASE ENET_BASE_ADDR |