[PATCH 0/2] Fix next build breakage in CI

[PATCH 0/2] Fix next build breakage in CI

[Ahmad Fatoum]

This should make CI green again AFAICS.

Ahmad Fatoum (2):
  fixup! gpio: fix static inline stub selection
  sandbox: os: define referenced config symbols

 arch/sandbox/os/Makefile      |  5 ++++-
 include/linux/gpio/consumer.h | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

-- 
2.39.5

[PATCH 1/2] fixup! gpio: fix static inline stub selection

[Ahmad Fatoum]

gpiod_count depends on OFDEVICE, but the stub was so far only defined
for CONFIG_GPIOLIB-less systems ignoring OFDEVICE. Move it into the
correct #ifdef branch to fix CI failure.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/linux/gpio/consumer.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index c5c9e14e4053..7dfac56239eb 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -66,6 +66,8 @@ struct gpio_desc *__must_check gpiod_get_index_optional(struct device *dev,
 							unsigned int index,
 							enum gpiod_flags flags);
 
+int gpiod_count(struct device *dev, const char *con_id);
+
 struct gpio_descs *__must_check gpiod_get_array(struct device *dev,
 						const char *con_id,
 						enum gpiod_flags flags);
@@ -96,6 +98,11 @@ gpiod_get_index_optional(struct device *dev, const char *con_id,
 	return NULL;
 }
 
+static inline int gpiod_count(struct device *dev, const char *con_id)
+{
+	return 0;
+}
+
 static inline struct gpio_descs *__must_check
 gpiod_get_array(struct device *dev, const char *con_id, enum gpiod_flags flags)
 {
@@ -122,8 +129,6 @@ void gpiod_put(struct gpio_desc *desc);
 
 int gpiod_set_consumer_name(struct gpio_desc *desc, const char *name);
 
-int gpiod_count(struct device *dev, const char *con_id);
-
 void gpiod_put_array(struct gpio_descs *descs);
 
 int gpiod_set_array_value(unsigned int array_size,
@@ -204,11 +209,6 @@ static inline int gpiod_set_consumer_name(struct gpio_desc *desc,
 	return -EINVAL;
 }
 
-static inline int gpiod_count(struct device *dev, const char *con_id)
-{
-	return 0;
-}
-
 static inline void gpiod_put_array(struct gpio_descs *descs)
 {
 	/* GPIO can never have been requested */
-- 
2.39.5

[PATCH 2/2] sandbox: os: define referenced config symbols

[Ahmad Fatoum]

We built the sandbox/os/ subdirectory with different compiler flags
to avoid barebox headers masking system provided headers.

This also means that CONFIG_ options aren't defined, but common.c
already references two of them.

Define them manually in the Makefile for now to fix build breakage in
some configurations.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/sandbox/os/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
index 055ce1a316a7..7a76fb0290e8 100644
--- a/arch/sandbox/os/Makefile
+++ b/arch/sandbox/os/Makefile
@@ -6,8 +6,11 @@ machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
 
 KBUILD_CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs))
 
+cppflags-$(CONFIG_CONSOLE_NONE) += -DCONFIG_CONSOLE_NONE=$(CONFIG_CONSOLE_NONE)
+cppflags-$(CONFIG_ASAN) += -DCONFIG_ASAN=$(CONFIG_ASAN)
+
 KBUILD_CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE) -D_FILE_OFFSET_BITS=64 \
-		   -DCONFIG_STACK_SIZE=$(CONFIG_STACK_SIZE)
+		   -DCONFIG_STACK_SIZE=$(CONFIG_STACK_SIZE) $(cppflags-y)
 
 KBUILD_CFLAGS := -Wall
 
-- 
2.39.5

Re: (subset) [PATCH 2/2] sandbox: os: define referenced config symbols

[Sascha Hauer]

On Tue, 07 Jan 2025 07:49:45 +0100, Ahmad Fatoum wrote:
> We built the sandbox/os/ subdirectory with different compiler flags
> to avoid barebox headers masking system provided headers.
> 
> This also means that CONFIG_ options aren't defined, but common.c
> already references two of them.
> 
> Define them manually in the Makefile for now to fix build breakage in
> some configurations.
> 
> [...]

Applied, thanks!

[2/2] sandbox: os: define referenced config symbols
      https://git.pengutronix.de/cgit/barebox/commit/?id=4f1f9844c939 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>