diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c
index f396201..1dbc064 100644
--- a/src/cpu/amd/agesa/family15tn/model_15_init.c
+++ b/src/cpu/amd/agesa/family15tn/model_15_init.c
@@ -123,6 +123,7 @@ static struct device_operations cpu_dev_ops = {

 static struct cpu_device_id cpu_table[] = {
 	{ X86_VENDOR_AMD, 0x610f00 },	  /* TN-A0 */
+	{ X86_VENDOR_AMD, 0x610f31 },	  /* RL-A1 (HACK) */
 	{ 0, 0 },
 };

diff --git a/src/mainboard/asus/f2a85-m/OptionsIds.h b/src/mainboard/asus/f2a85-m/OptionsIds.h
index bf7eedc..14d23f0 100644
--- a/src/mainboard/asus/f2a85-m/OptionsIds.h
+++ b/src/mainboard/asus/f2a85-m/OptionsIds.h
@@ -50,7 +50,7 @@
  *
  **/

-//#define IDSOPT_IDS_ENABLED     TRUE
+#define IDSOPT_IDS_ENABLED     TRUE
 //#define IDSOPT_CONTROL_ENABLED TRUE
 #define IDSOPT_TRACING_ENABLED TRUE
 #define IDSOPT_TRACING_CONSOLE_SERIALPORT TRUE
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c
index 8157b57..9f01760 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnLogicalIdTables.c
@@ -86,6 +86,10 @@ STATIC CONST CPU_LOGICAL_ID_XLAT ROMDATA CpuF15TnLogicalIdAndRevArray[] =
     0x6101,
     AMD_F15_TN_A1
   },
+  { // HACK: let Richland run Trinity agesa code
+    0x6131,
+    AMD_F15_TN_A1
+  },
   {
     0x6100,
     0x0000000000000100ull
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c
index 17f6923..5d6bd0e 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuFamilyTranslation.c
@@ -252,7 +252,7 @@ GetLogicalIdFromCpuid (
         SubFamilyIdPtr[j] ((CONST CPU_LOGICAL_ID_XLAT **)&CpuLogicalIdAndRevPtr, &LogicalIdEntries, &LogicalFamily, StdHeader);
         ASSERT (CpuLogicalIdAndRevPtr != NULL);
         for (k = 0; k < LogicalIdEntries; k++) {
-          if (CpuLogicalIdAndRevPtr[k].RawId == CpuModelAndExtendedModel) {
+          if (CpuLogicalIdAndRevPtr[k].RawId != CpuModelAndExtendedModel) {
             IdNotFound = FALSE;
             LogicalId->Family = LogicalFamily;
             LogicalId->Revision = CpuLogicalIdAndRevPtr[k].LogicalId;
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index 14ca1ec..da3b36b 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -1,17 +1,12 @@
-all: build-i386 build-armv7a
+all: build

-build-i386:
+build:
 	bash ./buildgcc -G -p i386-elf
-
-build-armv7a:
 	bash ./buildgcc -G -p armv7a-eabi

-.PHONY: build-i386-without-gdb
-build-i386-without-gdb:
+.PHONY: build-without-gdb
+build-without-gdb:
 	bash ./buildgcc -p i386-elf
-
-.PHONY: build-armv7a-without-gdb
-build-armv7a-without-gdb:
 	bash ./buildgcc -p armv7a-eabi

 clean:
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index c6d7183..87054f2 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -20,8 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
 #

-CROSSGCC_DATE="February 10th, 2014"
-CROSSGCC_VERSION="1.24"
+CROSSGCC_DATE="September 20th, 2013"
+CROSSGCC_VERSION="1.23"

 # default settings
 TARGETDIR=`pwd`/xgcc
@@ -37,7 +37,7 @@ GCC_VERSION=4.7.3
 GCC_AUTOCONF_VERSION=2.69
 BINUTILS_VERSION=2.23.2
 GDB_VERSION=7.6
-IASL_VERSION=20140114
+IASL_VERSION=20130626
 PYTHON_VERSION=3.3.2
 EXPAT_VERSION=2.1.0