mirror of
https://review.coreboot.org/flashrom.git
synced 2025-07-02 22:43:17 +02:00
Multiple unrelated changes
CONFIG_BITBANG_SPI was not selected if CONFIG_NICINTEL_SPI was on by default. Wiki output was missing all flash chips if CONFIG_INTERNAL was not selected. Use correct type for toupper()/tolower()/isspace() functions. Specify software requirements in a generic way. Non-x86 compilation does not work with the default programmer set, so list the make parameters which result in a working build. Corresponding to flashrom svn r1203. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
This commit is contained in:
30
Makefile
30
Makefile
@ -115,21 +115,6 @@ CONFIG_SERPROG ?= yes
|
||||
# RayeR SPIPGM hardware support
|
||||
CONFIG_RAYER_SPI ?= yes
|
||||
|
||||
# Bitbanging SPI infrastructure, default off unless needed.
|
||||
ifeq ($(CONFIG_RAYER_SPI), yes)
|
||||
override CONFIG_BITBANG_SPI = yes
|
||||
else
|
||||
ifeq ($(CONFIG_INTERNAL), yes)
|
||||
override CONFIG_BITBANG_SPI = yes
|
||||
else
|
||||
ifeq ($(CONFIG_NICINTEL_SPI), yes)
|
||||
override CONFIG_BITBANG_SPI = yes
|
||||
else
|
||||
CONFIG_BITBANG_SPI ?= no
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Always enable 3Com NICs for now.
|
||||
CONFIG_NIC3COM ?= yes
|
||||
|
||||
@ -170,6 +155,21 @@ CONFIG_DEDIPROG ?= no
|
||||
# Disable wiki printing by default. It is only useful if you have wiki access.
|
||||
CONFIG_PRINT_WIKI ?= no
|
||||
|
||||
# Bitbanging SPI infrastructure, default off unless needed.
|
||||
ifeq ($(CONFIG_RAYER_SPI), yes)
|
||||
override CONFIG_BITBANG_SPI = yes
|
||||
else
|
||||
ifeq ($(CONFIG_INTERNAL), yes)
|
||||
override CONFIG_BITBANG_SPI = yes
|
||||
else
|
||||
ifeq ($(CONFIG_NICINTEL_SPI), yes)
|
||||
override CONFIG_BITBANG_SPI = yes
|
||||
else
|
||||
CONFIG_BITBANG_SPI ?= no
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_INTERNAL), yes)
|
||||
FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1'
|
||||
PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o
|
||||
|
Reference in New Issue
Block a user