1 files changed, 1 insertions, 101 deletions
diff --git a/src/vendorcode/amd/cimx/rd890/nbDispatcher.c b/src/vendorcode/amd/cimx/rd890/nbDispatcher.c
index 16e86a1aaa..f1c315b7d7 100644
--- a/src/vendorcode/amd/cimx/rd890/nbDispatcher.c
+++ b/src/vendorcode/amd/cimx/rd890/nbDispatcher.c
@@ -85,109 +85,9 @@ AmdNbDispatcher (
   CIMX_TRACE ((TRACE_DATA (ConfigPtr, CIMX_TRACE_ALL), "CIMx - RD890 Entry \n"));
   CIMX_TRACE ((TRACE_DATA (ConfigPtr, CIMX_TRACE_ALL), "    Funcid = %x Callout = %x\n", ((AMD_CONFIG_PARAMS*)ConfigPtr)->Func, ((AMD_CONFIG_PARAMS*)ConfigPtr)->CalloutPtr));
 
-#ifdef B1_IMAGE
-  // 1. Try to execute any B1 specific functions
-  switch (((AMD_CONFIG_PARAMS*)ConfigPtr)->Func) {
-    #ifdef B1_IMAGE
-    // B1 ONLY Functions
-    //
-    //
-    #endif
-  default:
-    break;
-  }
-#endif
-
-  // 2. If not B1 specific function but we are B1, see if we can find B2 instead
-#ifdef B1_IMAGE
-  if (Status == AGESA_UNSUPPORTED) {
-    UINTN ImageStart;
-    UINTN ImageEnd;
-    AMD_IMAGE_HEADER* AltImagePtr;
-    ImageStart = 0xFFF00000;
-    ImageEnd = 0xFFFFFFFF;
-    AltImagePtr = (AMD_IMAGE_HEADER*) (UINTN) ((AMD_CONFIG_PARAMS*)ConfigPtr)->AltImageBasePtr;
 
-    if ((UINTN)AltImagePtr != 0xFFFFFFFF) {
-      if (AltImagePtr != NULL) {
-        ImageStart = (UINT32) (UINTN)AltImagePtr;
-        ImageEnd = ImageStart + 4;
-      }
-      // Locate/test image base that matches this component
-      AltImagePtr = LibAmdLocateImage ((VOID*)ImageStart, (VOID*)ImageEnd, 4096, CIMX_NB_ID);
-      if (AltImagePtr != NULL) {
-        //Invoke alternative Image
-        ImageEntry = (IMAGE_ENTRY) (UINTN) ((UINT8*) AltImagePtr + AltImagePtr->EntryPointAddress);
-        Status = (*ImageEntry) (ConfigPtr);
-      }
-    }
-  }
-#endif
-  if (Status == AGESA_UNSUPPORTED) {
- // 3. Try to execute any other functions
-    switch (((AMD_CONFIG_PARAMS*)ConfigPtr)->Func) {
+  // 2. AltImage not supported
 
-#if defined (B1_IMAGE) || defined (B2_IMAGE)
-// B1 & B2 Functions
-    case PH_AmdPowerOnResetInit:
-      Status = LibSystemApiCall (AmdPowerOnResetInit, ConfigPtr);
-      break;
-    case PH_AmdPcieEarlyInit:
-      Status = LibSystemApiCall (AmdPcieEarlyInit, ConfigPtr);
-      break;
-    case PH_AmdInitializer:
-      Status = LibSystemApiCall (AmdInitializer, ConfigPtr);
-      break;
-#endif
-#ifdef B2_IMAGE
-// B2 Functions
-    case PH_AmdNbHtInit :
-      Status = LibSystemApiCall (AmdHtInit, ConfigPtr);
-      break;
-    case PH_AmdEarlyPostInit  :
-      LibSystemApiCall (AmdMaskedMemoryInit, ConfigPtr);
-      Status = LibSystemApiCall (AmdEarlyPostInit, ConfigPtr);
-      break;
-    case PH_AmdMidPostInit  :
-      Status = LibSystemApiCall (AmdMidPostInit, ConfigPtr);
-      break;
-    case PH_AmdLatePostInit :
-      Status = LibSystemApiCall (AmdPcieLateInit, ConfigPtr);
-      Status = LibSystemApiCall (AmdLatePostInit, ConfigPtr);
-      Status = LibSystemApiCall (AmdPcieLateInitWa, ConfigPtr);
-      break;
-    case PH_AmdPcieValidatePortState :
-      Status = LibSystemApiCall (AmdPcieValidatePortState, ConfigPtr);
-      break;
-    case PH_AmdPcieLateInit :
-      Status = LibSystemApiCall (AmdPcieLateInit, ConfigPtr);
-      break;
-    case PH_AmdNbLateInit :
-      Status = LibSystemApiCall (AmdLatePostInit, ConfigPtr);
-      break;
-    case PH_AmdS3Init :
-      LibSystemApiCall (AmdMaskedMemoryInit, ConfigPtr);
-      Status = LibSystemApiCall (AmdS3InitIommu, ConfigPtr);
-      Status = LibSystemApiCall (AmdPcieS3Init, ConfigPtr);
-      Status = LibSystemApiCall (AmdS3Init, ConfigPtr);
-      Status = LibSystemApiCall (AmdPcieLateInitWa, ConfigPtr);
-      break;
-    case PH_AmdNbS3Init :
-      LibSystemApiCall (AmdMaskedMemoryInit, ConfigPtr);
-      Status = LibSystemApiCall (AmdS3Init, ConfigPtr);
-      break;
-    case PH_AmdPcieS3Init :
-      Status = LibSystemApiCall (AmdS3InitIommu, ConfigPtr);
-      Status = LibSystemApiCall (AmdPcieS3Init, ConfigPtr);
-      break;
-#endif
-#ifdef B3_IMAGE
-// B3 Functions
-#endif
-    default:
-      break;
-    }
-  }
 
  // 4. Try next dispatcher if possible, and we have not already got status back
   if ((mNbModuleID.NextBlock != NULL) && (Status == AGESA_UNSUPPORTED)) {