summaryrefslogtreecommitdiffstats
path: root/internal.c
diff options
context:
space:
mode:
Diffstat (limited to 'internal.c')
-rw-r--r--internal.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/internal.c b/internal.c
index bb606ca56..b8e0564ef 100644
--- a/internal.c
+++ b/internal.c
@@ -19,10 +19,13 @@
#include <stdlib.h>
#include "flash.h"
#include "programmer.h"
-#include "hwaccess_x86_io.h"
#include "hwaccess_physmap.h"
#include "platform/pci.h"
+#if defined(__i386__) || defined(__x86_64__)
+#include "hwaccess_x86_io.h"
+#endif
+
int is_laptop = 0;
int laptop_ok = 0;
@@ -241,11 +244,6 @@ static int internal_init(void)
}
free(arg);
- if (rget_io_perms()) {
- ret = 1;
- goto internal_init_exit;
- }
-
/* Default to Parallel/LPC/FWH flash devices. If a known host controller
* is found, the host controller init routine sets the
* internal_buses_supported bitfield.
@@ -271,6 +269,11 @@ static int internal_init(void)
}
#if defined(__i386__) || defined(__x86_64__)
+ if (rget_io_perms()) {
+ ret = 1;
+ goto internal_init_exit;
+ }
+
if ((cb_parse_table(&cb_vendor, &cb_model) == 0) && (board_vendor != NULL) && (board_model != NULL)) {
if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) {
msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n"