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

Makefile: merge compiler, hwlibs, features targets into config target

Browse Source 
These targets are all called together. No need to have them individual.

Change-Id: Ic76f923bca2beb6f95b8ea0cced4569b07e9b9ba
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/60107
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Thomas Heijligen 2021-12-09 17:52:23 +01:00 committed by Nico Huber
parent f43b4e3a48
commit a33524bf82
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile
View File

@ -899,15 +899,12 @@ endif
LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS)
OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS) OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS)
all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 all: config $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8
ifeq ($(ARCH), x86) ifeq ($(ARCH), x86)
@+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS) @+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS)
endif endif
# to define test programs we use verbatim variables, which get exported config:
# to environment variables and are referenced with $$<varname> later
compiler: featuresavailable
@echo -n "C compiler found: " @echo -n "C compiler found: "
@if [ $(CC_WORKING) = yes ]; \ @if [ $(CC_WORKING) = yes ]; \
then $(CC) --version 2>/dev/null | head -1; \ then $(CC) --version 2>/dev/null | head -1; \
@ -921,8 +918,6 @@ compiler: featuresavailable
echo " This might work but usually does not, please beware."; fi echo " This might work but usually does not, please beware."; fi
@echo "Target endian: $(ENDIAN)" @echo "Target endian: $(ENDIAN)"
@if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi @if [ $(ENDIAN) = unknown ]; then echo Aborting.; exit 1; fi
hwlibs: compiler
@echo Dependency libpci found: $(HAS_LIBPCI) @echo Dependency libpci found: $(HAS_LIBPCI)
@if [ $(HAS_LIBPCI) = yes ]; then \ @if [ $(HAS_LIBPCI) = yes ]; then \
echo " Checking for old \"pci_get_dev()\": $(HAS_PCI_OLD_GET_DEV)";\ echo " Checking for old \"pci_get_dev()\": $(HAS_PCI_OLD_GET_DEV)";\
@ -950,30 +945,22 @@ hwlibs: compiler
echo " CFLAGS: $(CONFIG_LIBFTDI1_CFLAGS)"; \ echo " CFLAGS: $(CONFIG_LIBFTDI1_CFLAGS)"; \
echo " LDFLAGS: $(CONFIG_LIBFTDI1_LDFLAGS)"; \ echo " LDFLAGS: $(CONFIG_LIBFTDI1_LDFLAGS)"; \
fi fi
features: hwlibs
@echo "Checking for header \"mtd/mtd-user.h\": $(HAS_LINUX_MTD)" @echo "Checking for header \"mtd/mtd-user.h\": $(HAS_LINUX_MTD)"
@echo "Checking for header \"linux/spi/spidev.h\": $(HAS_LINUX_SPI)" @echo "Checking for header \"linux/spi/spidev.h\": $(HAS_LINUX_SPI)"
@echo "Checking for header \"linux/i2c-dev.h\": $(HAS_LINUX_I2C)" @echo "Checking for header \"linux/i2c-dev.h\": $(HAS_LINUX_I2C)"
@echo "Checking for header \"linux/i2c.h\": $(HAS_LINUX_I2C)" @echo "Checking for header \"linux/i2c.h\": $(HAS_LINUX_I2C)"
@echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)" @echo "Checking for header \"sys/utsname.h\": $(HAS_UTSNAME)"
@echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)" @echo "Checking for function \"clock_gettime\": $(HAS_CLOCK_GETTIME)"
@if ! [ "$(PROGRAMMER_OBJS)" ]; then \
echo "You have to enable at least one programmer driver!"; \
exit 1; \
fi
@if [ "$(UNSUPPORTED_FEATURES)" ]; then \
echo "The following features are unavailable on your machine: $(UNSUPPORTED_FEATURES)" \
exit 1; \
fi
# If a user does not explicitly request a non-working feature, we should %.o: %.c config
# silently disable it. However, if a non-working (does not compile) feature
# is explicitly requested, we should bail out with a descriptive error message.
# We also have to check that at least one programmer driver is enabled.
featuresavailable:
ifeq ($(PROGRAMMER_OBJS),)
@echo "You have to enable at least one programmer driver!"
@false
endif
ifneq ($(UNSUPPORTED_FEATURES), )
@echo "The following features are unavailable on your machine: $(UNSUPPORTED_FEATURES)"
@false
endif
%.o: %.c features
$(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $< $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_CFLAGS) $(SCMDEF) -o $@ -c $<
$(PROGRAM)$(EXEC_SUFFIX): $(OBJS) $(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
@ -1053,7 +1040,7 @@ tarball: _export
libpayload: clean libpayload: clean
make CC="CC=i386-elf-gcc lpgcc" AR=i386-elf-ar RANLIB=i386-elf-ranlib make CC="CC=i386-elf-gcc lpgcc" AR=i386-elf-ar RANLIB=i386-elf-ranlib
.PHONY: all install clean distclean compiler hwlibs features _export export tarball featuresavailable libpayload .PHONY: all install clean distclean config _export export tarball libpayload
# Disable implicit suffixes and built-in rules (for performance and profit) # Disable implicit suffixes and built-in rules (for performance and profit)
.SUFFIXES: .SUFFIXES: