The internal programmer needs correct information about flash_base and
chip window top/bottom alignment on non-x86 before it can be used. Abort
any internal programmer action for now until the code is fixed.

Signed-off-by: Carl-Daniel Hailfinger <[email protected]>

Index: flashrom-disable_internal_nonx86/internal.c
===================================================================
--- flashrom-disable_internal_nonx86/internal.c (Revision 1013)
+++ flashrom-disable_internal_nonx86/internal.c (Arbeitskopie)
@@ -165,16 +165,22 @@
        pci_init(pacc);         /* Initialize the PCI library */
        pci_scan_bus(pacc);     /* We want to get the list of devices */
 
-       /* We look at the lbtable first to see if we need a
+#if defined(__i386__) || defined(__x86_64__)
+       /* We look at the cbtable first to see if we need a
         * mainboard specific flash enable sequence.
         */
        coreboot_init();
 
-#if defined(__i386__) || defined(__x86_64__)
        dmi_init();
 
        /* Probe for the Super I/O chip and fill global struct superio. */
        probe_superio();
+#else
+       /* FIXME: Enable cbtable searching on all non-x86 platforms supported
+        *        by coreboot.
+        * FIXME: Find a replacement for DMI on non-x86.
+        * FIXME: Enable SuperI/O probing once port I/O is possible.
+        */
 #endif
 
        /* Warn if a laptop is detected. */
@@ -200,6 +206,7 @@
                }
        }
 
+#if __FLASHROM_LITTLE_ENDIAN__
        /* try to enable it. Failure IS an option, since not all motherboards
         * really need this to be done, etc., etc.
         */
@@ -220,7 +227,25 @@
         * The error code might have been a warning only.
         * Besides that, we don't check the board enable return code either.
         */
+#if defined(__i386__) || defined(__x86_64__)
        return 0;
+#else
+       msg_perr("Your platform is not supported yet for the internal "
+                "programmer due to missing flash_base and top/bottom "
+                "alignment information.\n"
+                "Aborting.\n");
+       return 1;
+#endif
+#else
+       /* FIXME: Remove this unconditional abort once all PCI drivers are
+        * converted to use little-endian accesses for memory BARs.
+        */
+       msg_perr("Your platform is not supported yet for the internal "
+                "programmer because it has not been converted from native "
+                "endian to little endian access yet.\n"
+                "Aborting.\n");
+       return 1;
+#endif
 }
 
 int internal_shutdown(void)


-- 
http://www.hailfinger.org/


_______________________________________________
flashrom mailing list
[email protected]
http://www.flashrom.org/mailman/listinfo/flashrom

Reply via email to