Change in coreboot[master]: util/kconfig: Move coreboot specific changes into Makefile.inc

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37151 )

Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc
......................................................................

util/kconfig: Move coreboot specific changes into Makefile.inc

This eases maintenance of our kconfig fork.

Change-Id: Ia4bc0bf22e66457356b9f8fcbea9412792495bca
Signed-off-by: Patrick Georgi 
---
M Makefile
M util/kconfig/Makefile
A util/kconfig/Makefile.inc
3 files changed, 26 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/37151/1

diff --git a/Makefile b/Makefile
index f3f9592..41a9b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@

# This include must come _before_ the pattern rules below!
 # Order _does_ matter for pattern rules.
-include $(srck)/Makefile
+include $(srck)/Makefile.inc

# Three cases where we don't need fully populated $(obj) lists:
 # 1. when no .config exists
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index 147b125..1713b8d 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -10,14 +10,6 @@
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
    localmodconfig localyesconfig

-_OS=$(shell uname -s |cut -c-7)
-regex-objs=
-ifeq ($(_OS),MINGW32)
-	regex-objs=regex.o
-endif
-
-Kconfig ?= src/Kconfig
-
 xconfig: $(objk)/qconf
    $< $(Kconfig)

@@ -345,8 +337,6 @@
    $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ $(HOSTLOADLIBES_nconf)
 $(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs))
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
-$(objk)/toada: $(objk)/toada.o
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^

$(objk)/mconf.o: $(srck)/mconf.c
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
@@ -356,8 +346,6 @@
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
 $(objk)/conf.o: $(srck)/conf.c
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
-$(objk)/regex.o: $(srck)/regex.c
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $<

$(objk)/zconf.tab.o: $(objk)/zconf.tab.c $(objk)/zconf.lex.c \
    	     $(objk)/zconf.hash.c
@@ -385,8 +373,5 @@
 $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@

-$(objk)/toada.o: $(srck)/toada.c
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
-
 $(objk)/%.o: HOSTCFLAGS+=-I$(srck) -I$(objk)
 $(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk)
diff --git a/util/kconfig/Makefile.inc b/util/kconfig/Makefile.inc
new file mode 100644
index 0000000..fb612c9
--- /dev/null
+++ b/util/kconfig/Makefile.inc
@@ -0,0 +1,25 @@
+# Early configuration of coreboot specific changes
+Kconfig ?= src/Kconfig
+
+# Include verbatim Makefile
+include $(dir $(lastword $(MAKEFILE_LIST)))Makefile
+
+# Extend Linux kconfig build rules
+
+# Support mingw by shipping our own regex implementation
+_OS=$(shell uname -s |cut -c-7)
+regex-objs=
+ifeq ($(_OS),MINGW32)
+	regex-objs=regex.o
+endif
+$(objk)/regex.o: $(srck)/regex.c
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $<
+
+conf-objs += $(regex-objs)
+mconf-objs += $(regex-objs)
+
+# Provide tool to convert kconfig output into Ada format
+$(objk)/toada: $(objk)/toada.o
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
+$(objk)/toada.o: $(srck)/toada.c
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37151 )

Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/37151/1/util/kconfig/Makefile.inc 
File util/kconfig/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/37151/1/util/kconfig/Makefile.inc@1 
PS1, Line 1: # Early configuration of coreboot specific changes
(C) header?

[Patrick Georgi (Code Review)]

Hello Stefan Reinauer, build bot (Jenkins), Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/37151

to look at the new patch set (#3).

Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc
......................................................................

util/kconfig: Move coreboot specific changes into Makefile.inc

This eases maintenance of our kconfig fork.

Change-Id: Ia4bc0bf22e66457356b9f8fcbea9412792495bca
Signed-off-by: Patrick Georgi 
---
M Makefile
M util/kconfig/Makefile
A util/kconfig/Makefile.inc
3 files changed, 28 insertions(+), 16 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/37151/3

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37151 )

Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/37151/1/util/kconfig/Makefile.inc 
File util/kconfig/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/37151/1/util/kconfig/Makefile.inc@1 
PS1, Line 1: # Early configuration of coreboot specific changes
> (C) header?

Added a SPDX header

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37151 )

Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc
......................................................................

Patch Set 3: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37151 )

Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc
......................................................................

util/kconfig: Move coreboot specific changes into Makefile.inc

This eases maintenance of our kconfig fork.

Change-Id: Ia4bc0bf22e66457356b9f8fcbea9412792495bca
Signed-off-by: Patrick Georgi 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37151
Tested-by: build bot (Jenkins) 
Reviewed-by: Stefan Reinauer 
---
M Makefile
M util/kconfig/Makefile
A util/kconfig/Makefile.inc
3 files changed, 28 insertions(+), 16 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Stefan Reinauer: Looks good to me, approved

diff --git a/Makefile b/Makefile
index f3f9592..41a9b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@

# This include must come _before_ the pattern rules below!
 # Order _does_ matter for pattern rules.
-include $(srck)/Makefile
+include $(srck)/Makefile.inc

# Three cases where we don't need fully populated $(obj) lists:
 # 1. when no .config exists
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index 147b125..1713b8d 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -10,14 +10,6 @@
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
    localmodconfig localyesconfig

-_OS=$(shell uname -s |cut -c-7)
-regex-objs=
-ifeq ($(_OS),MINGW32)
-	regex-objs=regex.o
-endif
-
-Kconfig ?= src/Kconfig
-
 xconfig: $(objk)/qconf
    $< $(Kconfig)

@@ -345,8 +337,6 @@
    $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ $(HOSTLOADLIBES_nconf)
 $(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs))
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
-$(objk)/toada: $(objk)/toada.o
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^

$(objk)/mconf.o: $(srck)/mconf.c
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
@@ -356,8 +346,6 @@
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
 $(objk)/conf.o: $(srck)/conf.c
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
-$(objk)/regex.o: $(srck)/regex.c
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $<

$(objk)/zconf.tab.o: $(objk)/zconf.tab.c $(objk)/zconf.lex.c \
    	     $(objk)/zconf.hash.c
@@ -385,8 +373,5 @@
 $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
    $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@

-$(objk)/toada.o: $(srck)/toada.c
-	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
-
 $(objk)/%.o: HOSTCFLAGS+=-I$(srck) -I$(objk)
 $(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk)
diff --git a/util/kconfig/Makefile.inc b/util/kconfig/Makefile.inc
new file mode 100644
index 0000000..27681f7
--- /dev/null
+++ b/util/kconfig/Makefile.inc
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Early configuration of coreboot specific changes
+Kconfig ?= src/Kconfig
+
+# Include verbatim Makefile
+include $(dir $(lastword $(MAKEFILE_LIST)))Makefile
+
+# Extend Linux kconfig build rules
+
+# Support mingw by shipping our own regex implementation
+_OS=$(shell uname -s |cut -c-7)
+regex-objs=
+ifeq ($(_OS),MINGW32)
+	regex-objs=regex.o
+endif
+$(objk)/regex.o: $(srck)/regex.c
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $<
+
+conf-objs += $(regex-objs)
+mconf-objs += $(regex-objs)
+
+# Provide tool to convert kconfig output into Ada format
+$(objk)/toada: $(objk)/toada.o
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
+$(objk)/toada.o: $(srck)/toada.c
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<