Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r794f0aea88a5a860448e54e99db6e2e881b22900 -rcee800793b514f2fccd3776386b6cca41c6340ca
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 794f0aea88a5a860448e54e99db6e2e881b22900)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision cee800793b514f2fccd3776386b6cca41c6340ca)
@@ -20,8 +20,9 @@
 #include "sci.h"
 #include "sys_dma.h"
 
-#include "FPGA.h"
 #include "Comm.h"
+#include "Compatibility.h"
+#include "FPGA.h"
 #include "SystemCommMessages.h"
 #include "Utilities.h"
 
@@ -864,12 +865,28 @@
     // Check FPGA reported correct ID
     if ( FPGA_EXPECTED_ID == fpgaHeader.fpgaId )
     {
-        result = SELF_TEST_STATUS_PASSED;
+        // Check FPGA compatibility w/ firmware
+        if ( fpgaHeader.fpgaRevMajor > MIN_HD_FPGA_MAJOR )
+        {
+            result = SELF_TEST_STATUS_PASSED;
+        }
+        else
+        {
+            if ( MIN_HD_FPGA_MAJOR == fpgaHeader.fpgaRevMajor && fpgaHeader.fpgaRev >= MIN_HD_FPGA_MINOR )
+            {
+                result = SELF_TEST_STATUS_PASSED;
+            }
+            else
+            {
+                result = SELF_TEST_STATUS_FAILED;
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaRevMajor, (U32)fpgaHeader.fpgaRev )
+            }
+        }
     }
     else
     {
         result = SELF_TEST_STATUS_FAILED;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
     }
 
     return result;