diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-29 17:59:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-29 17:59:15 -0400 |
| commit | 333755ef7b6f824366eed37ae068c20a4f25a123 (patch) | |
| tree | 02adfef9881366ccb52a50ae085e2682fa5f9037 /include/configs | |
| parent | 2d64a0f7e952f54375702fb2b854461e402ded9d (diff) | |
| parent | c1c564af5200dd50bfa4a2f2e9a6c73d10de691c (diff) | |
Merge branch '2019-07-29-ti-imports'
- More DaVinci DM migration, drop am18xx EVM platform
- Keystone bug fix
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am3517_evm.h | 1 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 4 | ||||
| -rw-r--r-- | include/configs/omapl138_lcdk.h | 8 |
3 files changed, 4 insertions, 9 deletions
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 2e8481890f..c2c5c1f668 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -14,7 +14,6 @@ #include <configs/ti_omap3_common.h> -#undef CONFIG_DM_I2C_COMPAT #define CONFIG_REVISION_TAG /* Hardware drivers */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 2dab17afab..ff536131ba 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -174,6 +174,10 @@ #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_NAND_LOAD + +#ifndef CONFIG_SPL_BUILD +#define CONFIG_SYS_NAND_SELF_INIT +#endif #endif /* diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index da615e5063..db4a663c53 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -17,14 +17,6 @@ #undef CONFIG_SYS_USE_NOR /* -* Disable DM_* for SPL build and can be re-enabled after adding -* DM support in SPL -*/ -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_I2C -#undef CONFIG_DM_I2C_COMPAT -#endif -/* * SoC Configuration */ #define CONFIG_MACH_OMAPL138_LCDK |