commit aa5268df1dde6a952465e345bcdf806c22d3154b
author Nico Huber <nico.huber@secunet.com> Thu Mar 09 17:15:23 2023 +0100
committer Nico Huber <nico.h@gmx.de> Thu Mar 16 21:48:53 2023 +0000
tree 45d2547b29ac97dc17f0bbe73ccfbd62a78aae54
parent 71c97eebf266e1b682e4d1643b50cf4bc753b0be

Rename CONFIG_LINUX_GPIOD --> CONFIG_LINUX_GPIO_SPI

Rename the config variable so it matches the programmer driver's name.

Change-Id: I5cb44203dc9bb3db6de0c79e97435a376c059723
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/73588
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

Makefile

diff --git a/Makefile b/Makefile
index 665e96c..92f5901 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@
 DEPENDS_ON_BITBANG_SPI := \
 	CONFIG_DEVELOPERBOX_SPI \
 	CONFIG_INTERNAL_X86 \
-	CONFIG_LINUX_GPIOD \
+	CONFIG_LINUX_GPIO_SPI \
 	CONFIG_NICINTEL_SPI \
 	CONFIG_OGP_SPI \
 	CONFIG_PONY_SPI \
@@ -179,7 +179,7 @@
 	CONFIG_MSTARDDC_SPI \
 
 DEPENDS_ON_LIBGPIOD := \
-	CONFIG_LINUX_GPIOD \
+	CONFIG_LINUX_GPIO_SPI \
 
 ifeq ($(CONFIG_ENABLE_LIBUSB1_PROGRAMMERS), no)
 $(call disable_all,$(DEPENDS_ON_LIBUSB1))
@@ -512,7 +512,7 @@
 # Enable Linux spidev, MTD and gpiod interfaces by default. We disable them on non-Linux targets.
 CONFIG_LINUX_MTD ?= yes
 CONFIG_LINUX_SPI ?= yes
-CONFIG_LINUX_GPIOD ?= yes
+CONFIG_LINUX_GPIO_SPI ?= yes
 
 # Always enable ITE IT8212F PATA controllers for now.
 CONFIG_IT8212 ?= yes
@@ -744,8 +744,8 @@
 PROGRAMMER_OBJS += linux_spi.o
 endif
 
-ifeq ($(CONFIG_LINUX_GPIOD), yes)
-FEATURE_FLAGS += -D'CONFIG_LINUX_GPIOD=1'
+ifeq ($(CONFIG_LINUX_GPIO_SPI), yes)
+FEATURE_FLAGS += -D'CONFIG_LINUX_GPIO_SPI=1'
 PROGRAMMER_OBJS += linux_gpio_spi.o
 endif
 

meson.build

diff --git a/meson.build b/meson.build
index fa08c93..81b3b8b 100644
--- a/meson.build
+++ b/meson.build
@@ -299,7 +299,7 @@
     'deps'    : [ libgpiod ],
     'groups'  : [ group_gpiod, group_external ],
     'srcs'    : files('linux_gpio_spi.c'),
-    'flags'   : [ '-DCONFIG_LINUX_GPIOD=1' ],
+    'flags'   : [ '-DCONFIG_LINUX_GPIO_SPI=1' ],
   },
   'linux_mtd' : {
     'systems' : [ 'linux' ],

programmer_table.c

diff --git a/programmer_table.c b/programmer_table.c
index 80509e5..d8be1d5 100644
--- a/programmer_table.c
+++ b/programmer_table.c
@@ -112,7 +112,7 @@
     &programmer_satamv,
 #endif
 
-#if CONFIG_LINUX_GPIOD == 1
+#if CONFIG_LINUX_GPIO_SPI == 1
     &programmer_linux_gpio_spi,
 #endif