# HG changeset patch # User Mychaela Falconia # Date 1590218503 0 # Node ID a18bf8df5fab30ddc90fa2b18fad4e2a23013fb8 # Parent 6a53de2c4fc27b8f0a400b6009afbfbc80e43426 aci_pei.c: sync with Magnetite for (MMI != 0) There was a change in Magnetite aci3 for (MMI != 0) configuration; this config does not exist in Selenite, but this change is being pulled in as a sync in order to keep the diff between Magnetite and Selenite to a minimum. diff -r 6a53de2c4fc2 -r a18bf8df5fab src/g23m-aci/aci/aci_pei.c --- a/src/g23m-aci/aci/aci_pei.c Sat May 23 07:13:36 2020 +0000 +++ b/src/g23m-aci/aci/aci_pei.c Sat May 23 07:21:43 2020 +0000 @@ -154,6 +154,10 @@ extern const char firmware_version_str[]; +#if (MMI != 0) +extern int r2d_is_running; +#endif + /*==== DEFINE =====================================================*/ @@ -1384,6 +1388,12 @@ #endif /* TI_PS_HCOMM_CHANGE */ +/* FreeCalypso addition to fix R2D start race condition */ +#if (MMI != 0) + if (!r2d_is_running) + return PEI_ERROR; +#endif + #ifdef DTI #ifdef _SIMULATION_ /*