openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

internal: Only build on x86 and mipsel

Browse Source 
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>
This commit is contained in:
Nico Huber 2017-12-01 18:19:43 +00:00
parent 095522ccec
commit c880173472
2 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -378,6 +378,15 @@ endif
override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) 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 '^\#')) 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. # 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. # Right now this means the drivers below only work on x86.
ifneq ($(ARCH), x86) ifneq ($(ARCH), x86)
@ -422,11 +431,6 @@ endif
# architectures with unknown raw access properties. # architectures with unknown raw access properties.
# Right now those architectures are alpha hppa m68k sh s390 # Right now those architectures are alpha hppa m68k sh s390
ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc)) 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) ifeq ($(CONFIG_RAYER_SPI), yes)
UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes
else else

36
internal.c
View File

@ -25,7 +25,6 @@
#include "programmer.h" #include "programmer.h"
#include "hwaccess.h" #include "hwaccess.h"
#if NEED_PCI == 1
struct pci_dev *pci_dev_find_filter(struct pci_filter filter) struct pci_dev *pci_dev_find_filter(struct pci_filter filter)
{ {
struct pci_dev *temp; struct pci_dev *temp;
@ -94,13 +93,11 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device,
return NULL; return NULL;
} }
#endif
#if CONFIG_INTERNAL == 1
int force_boardenable = 0; int force_boardenable = 0;
int force_boardmismatch = 0; int force_boardmismatch = 0;
#if defined(__i386__) || defined(__x86_64__) #if IS_X86
void probe_superio(void) void probe_superio(void)
{ {
probe_superio_winbond(); probe_superio_winbond();
@ -131,7 +128,6 @@ int register_superio(struct superio s)
int is_laptop = 0; int is_laptop = 0;
int laptop_ok = 0; int laptop_ok = 0;
#if IS_X86 || IS_MIPS
static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr); chipaddr addr);
static void internal_chip_writew(const struct flashctx *flash, uint16_t val, static void internal_chip_writew(const struct flashctx *flash, uint16_t val,
@ -156,20 +152,17 @@ static const struct par_master par_master_internal = {
.chip_writel = internal_chip_writel, .chip_writel = internal_chip_writel,
.chip_writen = fallback_chip_writen, .chip_writen = fallback_chip_writen,
}; };
#endif
enum chipbustype internal_buses_supported = BUS_NONE; enum chipbustype internal_buses_supported = BUS_NONE;
int internal_init(void) int internal_init(void)
{ {
#if defined __FLASHROM_LITTLE_ENDIAN__
int ret = 0; int ret = 0;
#endif
int force_laptop = 0; int force_laptop = 0;
int not_a_laptop = 0; int not_a_laptop = 0;
const char *board_vendor = NULL; const char *board_vendor = NULL;
const char *board_model = NULL; const char *board_model = NULL;
#if IS_X86 || IS_ARM #if IS_X86
const char *cb_vendor = NULL; const char *cb_vendor = NULL;
const char *cb_model = NULL; const char *cb_model = NULL;
#endif #endif
@ -251,7 +244,7 @@ int internal_init(void)
return 1; 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 ((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)) { 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" msg_pwarn("Warning: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n"
@ -314,7 +307,6 @@ int internal_init(void)
} }
} }
#ifdef __FLASHROM_LITTLE_ENDIAN__
/* try to enable it. Failure IS an option, since not all motherboards /* try to enable it. Failure IS an option, since not all motherboards
* really need this to be done, etc., etc. * really need this to be done, etc., etc.
*/ */
@ -336,31 +328,10 @@ int internal_init(void)
} }
#endif #endif
#if IS_X86 || IS_MIPS
register_par_master(&par_master_internal, internal_buses_supported); register_par_master(&par_master_internal, internal_buses_supported);
return 0; 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, static void internal_chip_writeb(const struct flashctx *flash, uint8_t val,
chipaddr addr) chipaddr addr)
{ {
@ -403,4 +374,3 @@ static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf,
mmio_readn((void *)addr, buf, len); mmio_readn((void *)addr, buf, len);
return; return;
} }
#endif