[coreboot-gerrit] New patch to review for coreboot: 64d24da Revert "Asus F2A85-M: Activate IOMMU support"

[Paul Menzel (paulepanter@users.sourceforge.net)]

Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3373

-gerrit

commit 64d24da6408d0eefdb61c8c093d4beacb3eeaa38
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Wed Jun 5 08:34:20 2013 +0200

    Revert "Asus F2A85-M: Activate IOMMU support"
    
    This reverts commit eed28f97b375a9469a2872996c19eb102647052e.
    
    For whatever reason, the dependencies were lost in Gerrit and the
    commit [1] was submitted without its dependencies. As a result
    buidling the ASUS F2A85-M fails now [2] and therefore commits
    based on this commit fail to pass the buid tests by Jenkins.
    
        […]
        Created CBFS image (capacity = 8387656 bytes)
            LINK       cbfs/fallback/romstage_null.debug
            CC         cbfs/fallback/coreboot_ram.debug
        coreboot-builds/asus_f2a85-m/generated/coreboot_ram.o:(.data+0x16b9c): undefined reference to `GnbIommuScratchMemoryRangeInterface'
        collect2: error: ld returned 1 exit status
        make: *** [coreboot-builds/asus_f2a85-m/cbfs/fallback/coreboot_ram.debug] Error 1
        make: *** Waiting for unfinished jobs....
        coreboot-builds/asus_f2a85-m/mainboard/asus/f2a85-m/buildOpts.romstage.o:(.data+0x3d8): undefined reference to `GnbIommuScratchMemoryRangeInterface'
        collect2: error: ld returned 1 exit status
        make: *** [coreboot-builds/asus_f2a85-m/cbfs/fallback/romstage_null.debug] Error 1
        […]
    
    Therefore revert the commit to get the tree working again and
    submit this patch with its dependencies again.
    
    [1] http://review.coreboot.org/#/c/3317/
    [2] http://qa.coreboot.org/job/coreboot-gerrit/6618/testReport/junit/(root)/board/i386_asus_f2a85_m/
    
    Change-Id: I911755884da09eb0a0651b8db07ee2a32e6eaaaa
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 src/mainboard/asus/f2a85-m/buildOpts.c   | 2 +-
 src/mainboard/asus/f2a85-m/devicetree.cb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mainboard/asus/f2a85-m/buildOpts.c b/src/mainboard/asus/f2a85-m/buildOpts.c
index 4080e8b..7f893f9 100644
--- a/src/mainboard/asus/f2a85-m/buildOpts.c
+++ b/src/mainboard/asus/f2a85-m/buildOpts.c
@@ -171,7 +171,7 @@
 #define BLDCFG_UMA_ABOVE4G_SUPPORT                FALSE
 #endif
 
-#define BLDCFG_IOMMU_SUPPORT    TRUE
+#define BLDCFG_IOMMU_SUPPORT    FALSE
 
 #define BLDCFG_CFG_GNB_HD_AUDIO TRUE
 //#define BLDCFG_IGPU_SUBSYSTEM_ID            OEM_IGPU_SSID
diff --git a/src/mainboard/asus/f2a85-m/devicetree.cb b/src/mainboard/asus/f2a85-m/devicetree.cb
index 1cc610e..0014381 100644
--- a/src/mainboard/asus/f2a85-m/devicetree.cb
+++ b/src/mainboard/asus/f2a85-m/devicetree.cb
@@ -30,7 +30,6 @@ chip northbridge/amd/agesa/family15tn/root_complex
 
 			chip northbridge/amd/agesa/family15tn # PCI side of HT root complex
 				device pci 0.0 on  end # Root Complex
-				device pci 0.2 on  end # IOMMU
 				device pci 1.0 on  end # Internal Graphics P2P bridge 0x99XX
 				device pci 1.1 on  end # Internal Multimedia
 				device pci 2.0 on end # PCIE SLOT0 x16 blue