diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
| commit | 62861c70d3128680823fa091dcc2f6fee3bca30c (patch) | |
| tree | 1effa13c5319dcb55f5167d707d1662c0de9503b /include/configs/colibri-imx6ull.h | |
| parent | 2baa731d0076b9aff721a2c737c479f65cc931e9 (diff) | |
| parent | d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 (diff) | |
Merge branch '2019-10-04-master-imports'
- Assorted TI platform fixes
- Revert the change that broke environment flag validation
- Assorted typo fixes
- Assorted Kconfig dependency fixes
- Other minor bug fixes
Diffstat (limited to 'include/configs/colibri-imx6ull.h')
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 736717486b..0a4f30fbaf 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -28,9 +28,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 1 -#undef CONFIG_BOOTM_PLAN9 -#undef CONFIG_BOOTM_RTEMS - /* I2C configs */ #define CONFIG_SYS_I2C_SPEED 100000 |