diff -r 5fadf5993418 -r 8eb0477e44ec configs/common/FSConfig.py
--- a/configs/common/FSConfig.py	Tue Aug 19 10:40:11 2014 +0100
+++ b/configs/common/FSConfig.py	Tue Aug 19 10:41:34 2014 +0100
@@ -225,13 +225,9 @@
     # Attach any PCI devices this platform supports
     self.realview.attachPciDevices()
     # default to an IDE controller rather than a CF one
-    # assuming we've got one; EMM64 is an exception for the moment
-    if machine_type != "VExpress_EMM64":
-        try:
-            self.realview.ide.disks = [self.cf0]
-        except:
-            self.realview.cf_ctrl.disks = [self.cf0]
-    else:
+    try:
+        self.realview.ide.disks = [self.cf0]
+    except:
         self.realview.cf_ctrl.disks = [self.cf0]
 
     if bare_metal:
@@ -241,7 +237,7 @@
                                      size = mdesc.mem())]
     else:
         if machine_type == "VExpress_EMM64":
-            self.kernel = binary('vmlinux-3.14-aarch64-vexpress-emm64')
+            self.kernel = binary('vmlinux-3.16-aarch64-vexpress-emm64-pcie')
         elif machine_type == "VExpress_EMM":
             self.kernel = binary('vmlinux-3.3-arm-vexpress-emm-pcie')
         else: