Revert "lynxpoint: Move ME lock down to ramstage"

This reverts commit ff81f50f0e.

Deferring this step until the finalize stage will allow us
to defer waiting for the MBP clear indicator and speeding
up the boot.

BUG=chrome-os-partner:19933
BRANCH=falco
TEST=manual: emerge-falco chromeos-coreboot-falco

Change-Id: Ib8edffd06689e72875830cd68b5aedb7ac3b0559
Reviewed-on: https://gerrit.chromium.org/gerrit/62631
Tested-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Commit-Queue: Duncan Laurie <dlaurie@chromium.org>

src/mainboard/intel/baskingridge/mainboard_smi.c

@@ -84,6 +84,7 @@ int mainboard_smi_apmc(u8 apmc)
 			return 0;
 		}
 
+		intel_me_finalize_smm();
 		intel_pch_finalize_smm();
 		intel_northbridge_haswell_finalize_smm();
 		intel_cpu_haswell_finalize_smm();

src/mainboard/intel/wtm2/mainboard_smi.c

@@ -60,6 +60,7 @@ int mainboard_smi_apmc(u8 apmc)
 			return 0;
 		}
 
+		intel_me_finalize_smm();
 		intel_pch_finalize_smm();
 		intel_northbridge_haswell_finalize_smm();
 		intel_cpu_haswell_finalize_smm();