internal: Only build on x86 and mipsel
internal_init() explicitly fails on everything but x86 and mipsel.
Instead, we can just never build the internal programmer on other
architectures and drop a lot of #if boilerplate.
Change-Id: I672ddab0415df3baa49ff39a1c9db1b41d8143a4
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22671
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
diff --git a/Makefile b/Makefile
index bd2cc10..a97761f 100644
--- a/Makefile
+++ b/Makefile
@@ -378,6 +378,15 @@
override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"'))
override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#'))
+# Disable the internal programmer on unsupported architectures (everything but x86 and mipsel)
+ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN))
+ifeq ($(CONFIG_INTERNAL), yes)
+UNSUPPORTED_FEATURES += CONFIG_INTERNAL=yes
+else
+override CONFIG_INTERNAL = no
+endif
+endif
+
# PCI port I/O support is unimplemented on PPC/MIPS/SPARC and unavailable on ARM.
# Right now this means the drivers below only work on x86.
ifneq ($(ARCH), x86)
@@ -422,11 +431,6 @@
# architectures with unknown raw access properties.
# Right now those architectures are alpha hppa m68k sh s390
ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc))
-ifeq ($(CONFIG_INTERNAL), yes)
-UNSUPPORTED_FEATURES += CONFIG_INTERNAL=yes
-else
-override CONFIG_INTERNAL = no
-endif
ifeq ($(CONFIG_RAYER_SPI), yes)
UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes
else
diff --git a/internal.c b/internal.c
index 276e14b..4d58eb9 100644
--- a/internal.c
+++ b/internal.c
@@ -25,7 +25,6 @@
#include "programmer.h"
#include "hwaccess.h"
-#if NEED_PCI == 1
struct pci_dev *pci_dev_find_filter(struct pci_filter filter)
{
struct pci_dev *temp;
@@ -94,13 +93,11 @@
return NULL;
}
-#endif
-#if CONFIG_INTERNAL == 1
int force_boardenable = 0;
int force_boardmismatch = 0;
-#if defined(__i386__) || defined(__x86_64__)
+#if IS_X86
void probe_superio(void)
{
probe_superio_winbond();
@@ -131,7 +128,6 @@
int is_laptop = 0;
int laptop_ok = 0;
-#if IS_X86 || IS_MIPS
static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr);
static void internal_chip_writew(const struct flashctx *flash, uint16_t val,
@@ -156,20 +152,17 @@
.chip_writel = internal_chip_writel,
.chip_writen = fallback_chip_writen,
};
-#endif
enum chipbustype internal_buses_supported = BUS_NONE;
int internal_init(void)
{
-#if defined __FLASHROM_LITTLE_ENDIAN__
int ret = 0;
-#endif
int force_laptop = 0;
int not_a_laptop = 0;
const char *board_vendor = NULL;
const char *board_model = NULL;
-#if IS_X86 || IS_ARM
+#if IS_X86
const char *cb_vendor = NULL;
const char *cb_model = NULL;
#endif
@@ -251,7 +244,7 @@
return 1;
}
-#if IS_X86 || IS_ARM
+#if IS_X86
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"
@@ -314,7 +307,6 @@
}
}
-#ifdef __FLASHROM_LITTLE_ENDIAN__
/* try to enable it. Failure IS an option, since not all motherboards
* really need this to be done, etc., etc.
*/
@@ -336,31 +328,10 @@
}
#endif
-#if IS_X86 || IS_MIPS
register_par_master(&par_master_internal, internal_buses_supported);
return 0;
-#else
- msg_perr("Your platform is not supported yet for the internal "
- "programmer due to missing\n"
- "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\n"
- "not been converted from native endian to little endian "
- "access yet.\n"
- "Aborting.\n");
- return 1;
-#endif
}
-#endif
-#if IS_X86 || IS_MIPS
static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr)
{
@@ -403,4 +374,3 @@
mmio_readn((void *)addr, buf, len);
return;
}
-#endif