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/apalis-imx8.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/apalis-imx8.h')
| -rw-r--r-- | include/configs/apalis-imx8.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 6eb8395162..3a8d2d40d7 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -13,8 +13,6 @@ #define CONFIG_DISPLAY_BOARDINFO_LATE -#undef CONFIG_BOOTM_NETBSD - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 |