flashrom: Update to 1.3.0, package libflashrom

[feed/packages.git] / utils / flashrom / flashrom.mk

diff --git a/utils/flashrom/flashrom.mk b/utils/flashrom/flashrom.mk
index f0fdff539aae96d619ef516277cd4dc87d64ad8b..5ee91a8f063dc86184eec21d6669b8a88c104db7 100644 (file)
--- a/utils/flashrom/flashrom.mk
+++ b/utils/flashrom/flashrom.mk
@@ -1,11 +1,7 @@
 # Flashrom variants
 
-define DefaultProgrammer
-  MAKE_FLAGS += CONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_$(1)
-endef
-
 ifeq ($(BUILD_VARIANT),full)
-  $(eval $(call DefaultProgrammer,LINUX_SPI))
+  DEFAULT_PROGRAMMER_NAME := linux_spi
   FLASHROM_BASIC := true
   FLASHROM_FTDI := true
   FLASHROM_PCI := true
@@ -14,7 +10,7 @@ ifeq ($(BUILD_VARIANT),full)
   FLASHROM_USB := true
 endif
 ifeq ($(BUILD_VARIANT),pci)
-  $(eval $(call DefaultProgrammer,INTERNAL))
+  DEFAULT_PROGRAMMER_NAME := internal
   FLASHROM_BASIC := true
   FLASHROM_FTDI := false
   FLASHROM_PCI := true
@@ -23,7 +19,7 @@ ifeq ($(BUILD_VARIANT),pci)
   FLASHROM_USB := false
 endif
 ifeq ($(BUILD_VARIANT),spi)
-  $(eval $(call DefaultProgrammer,LINUX_SPI))
+  DEFAULT_PROGRAMMER_NAME := linux_spi
   FLASHROM_BASIC := true
   FLASHROM_FTDI := false
   FLASHROM_PCI := false
@@ -32,7 +28,7 @@ ifeq ($(BUILD_VARIANT),spi)
   FLASHROM_USB := false
 endif
 ifeq ($(BUILD_VARIANT),usb)
-  $(eval $(call DefaultProgrammer,SERPROG))
+  DEFAULT_PROGRAMMER_NAME := serprog
   FLASHROM_BASIC := true
   FLASHROM_FTDI := true
   FLASHROM_PCI := false
@@ -41,59 +37,68 @@ ifeq ($(BUILD_VARIANT),usb)
   FLASHROM_USB := true
 endif
 
-MESON_ARGS += \
-       -Dconfig_dummy=$(FLASHROM_BASIC) \
-       -Dconfig_linux_mtd=$(FLASHROM_BASIC) \
-       -Dconfig_linux_spi=$(FLASHROM_BASIC) \
-       -Dconfig_mstarddc_spi=$(FLASHROM_BASIC) \
-       \
-       -Dconfig_ft2232_spi=$(FLASHROM_FTDI) \
-       -Dconfig_usbblaster_spi=$(FLASHROM_FTDI) \
-       \
-       -Dpciutils=$(FLASHROM_PCI) \
-       -Dconfig_atavia=$(FLASHROM_PCI) \
-       -Dconfig_drkaiser=$(FLASHROM_PCI) \
-       -Dconfig_gfxnvidia=$(FLASHROM_PCI) \
-       -Dconfig_internal=$(FLASHROM_PCI) \
-       -Dconfig_it8212=$(FLASHROM_PCI) \
-       -Dconfig_nicintel=$(FLASHROM_PCI) \
-       -Dconfig_nicintel_spi=$(FLASHROM_PCI) \
-       -Dconfig_nicintel_eeprom=$(FLASHROM_PCI) \
-       -Dconfig_ogp_spi=$(FLASHROM_PCI) \
-       -Dconfig_satasii=$(FLASHROM_PCI) \
-       \
-       -Dconfig_bitbang_spi=$(FLASHROM_RAW) \
-       -Dconfig_rayer_spi=$(FLASHROM_RAW) \
-       \
-       -Dconfig_buspirate_spi=$(FLASHROM_SERIAL) \
-       -Dconfig_pony_spi=$(FLASHROM_SERIAL) \
-       -Dconfig_serprog=$(FLASHROM_SERIAL) \
-       \
-       -Dusb=$(FLASHROM_USB) \
-       -Dconfig_ch341a_spi=$(FLASHROM_USB) \
-       -Dconfig_dediprog=$(FLASHROM_USB) \
-       -Dconfig_developerbox_spi=$(FLASHROM_USB) \
-       -Dconfig_digilent_spi=$(FLASHROM_USB) \
-       -Dconfig_pickit2_spi=$(FLASHROM_USB) \
-       -Dconfig_stlinkv3_spi=$(FLASHROM_USB)
+PROGRAMMER_ARGS :=
+
+define Programmer
+  ifeq ($(2),true)
+    PROGRAMMER_ARGS += $(1)
+  endif
+endef
+
+$(eval $(call Programmer,dummy,$(FLASHROM_BASIC)))
+$(eval $(call Programmer,linux_mtd,$(FLASHROM_BASIC)))
+$(eval $(call Programmer,linux_spi,$(FLASHROM_BASIC)))
+$(eval $(call Programmer,mstarddc_spi,$(FLASHROM_BASIC)))
+
+$(eval $(call Programmer,ft2232_spi,$(FLASHROM_FTDI)))
+$(eval $(call Programmer,usbblaster_spi,$(FLASHROM_FTDI)))
+
+$(eval $(call Programmer,atavia,$(FLASHROM_PCI)))
+$(eval $(call Programmer,drkaiser,$(FLASHROM_PCI)))
+$(eval $(call Programmer,gfxnvidia,$(FLASHROM_PCI)))
+$(eval $(call Programmer,internal,$(FLASHROM_PCI)))
+$(eval $(call Programmer,it8212,$(FLASHROM_PCI)))
+$(eval $(call Programmer,nicintel,$(FLASHROM_PCI)))
+$(eval $(call Programmer,nicintel_spi,$(FLASHROM_PCI)))
+$(eval $(call Programmer,nicintel_eeprom,$(FLASHROM_PCI)))
+$(eval $(call Programmer,ogp_spi,$(FLASHROM_PCI)))
+$(eval $(call Programmer,satasii,$(FLASHROM_PCI)))
+
+$(eval $(call Programmer,rayer_spi,$(FLASHROM_RAW)))
+
+$(eval $(call Programmer,buspirate_spi,$(FLASHROM_SERIAL)))
+$(eval $(call Programmer,pony_spi,$(FLASHROM_SERIAL)))
+$(eval $(call Programmer,serprog,$(FLASHROM_SERIAL)))
+
+$(eval $(call Programmer,ch341a_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,dediprog,$(FLASHROM_USB)))
+$(eval $(call Programmer,developerbox_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,digilent_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,pickit2_spi,$(FLASHROM_USB)))
+$(eval $(call Programmer,stlinkv3_spi,$(FLASHROM_USB)))
 
 # PCI
 ifeq ($(findstring i386,$(CONFIG_ARCH))$(findstring x86,$(CONFIG_ARCH)),)
-MESON_ARGS += \
-       -Dconfig_atahpt=false \
-       -Dconfig_atapromise=false \
-       -Dconfig_internal_dmi=true \
-       -Dconfig_nic3com=false \
-       -Dconfig_nicnatsemi=false \
-       -Dconfig_nicrealtek=false \
-       -Dconfig_satamv=false
+  MESON_ARGS += -Duse_internal_dmi=true
+  $(eval $(call Programmer,atahpt,false))
+  $(eval $(call Programmer,atapromise,false))
+  $(eval $(call Programmer,nic3com,false))
+  $(eval $(call Programmer,nicnatsemi,false))
+  $(eval $(call Programmer,nicrealtek,false))
+  $(eval $(call Programmer,satamv,false))
 else
-MESON_ARGS += \
-       -Dconfig_atahpt=$(FLASHROM_PCI) \
-       -Dconfig_atapromise=$(FLASHROM_PCI) \
-       -Dconfig_internal_dmi=$(if $(FLASHROM_PCI),false,true)
-       -Dconfig_nic3com=$(FLASHROM_PCI) \
-       -Dconfig_nicnatsemi=$(FLASHROM_PCI) \
-       -Dconfig_nicrealtek=$(FLASHROM_PCI) \
-       -Dconfig_satamv=$(FLASHROM_PCI)
+  MESON_ARGS += -Duse_internal_dmi=$(if $(FLASHROM_PCI),false,true)
+  $(eval $(call Programmer,atahpt,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,atapromise,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,nic3com,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,nicnatsemi,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,nicrealtek,$(FLASHROM_PCI)))
+  $(eval $(call Programmer,satamv,$(FLASHROM_PCI)))
 endif
+
+comma := ,
+MESON_ARGS += \
+       -Ddefault_programmer_name=$(DEFAULT_PROGRAMMER_NAME) \
+       -Dprogrammer=$(subst $() $(),$(comma),$(PROGRAMMER_ARGS)) \
+       -Dwerror=false \
+       -Dtests=disabled