GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This eases maintenance of our kconfig fork.

Change-Id: Ia4bc0bf22e66457356b9f8fcbea9412792495bca
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37151
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi 2019-11-22 16:54:17 +01:00
parent d492f01bf1
commit 3e8ef1028d
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -119,7 +119,7 @@ help_coreboot help::
# This include must come _before_ the pattern rules below! # This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules. # Order _does_ matter for pattern rules.
include $(srck)/Makefile include $(srck)/Makefile.inc
# Three cases where we don't need fully populated $(obj) lists: # Three cases where we don't need fully populated $(obj) lists:
# 1. when no .config exists # 1. when no .config exists

15
util/kconfig/Makefile
View File

@ -10,14 +10,6 @@ DEFCONFIG?=defconfig
PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
localmodconfig localyesconfig 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 xconfig: $(objk)/qconf
$< $(Kconfig) $< $(Kconfig)
@ -345,8 +337,6 @@ $(objk)/nconf: $(patsubst %,$(objk)/%,$(nconf-objs))
$(HOSTCC) $(HOSTCFLAGS) -o $@ $^ $(HOSTLOADLIBES_nconf) $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ $(HOSTLOADLIBES_nconf)
$(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs)) $(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs))
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
$(objk)/toada: $(objk)/toada.o
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^
$(objk)/mconf.o: $(srck)/mconf.c $(objk)/mconf.o: $(srck)/mconf.c
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
@ -356,8 +346,6 @@ $(objk)/nconf.gui.o: $(srck)/nconf.gui.c
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $<
$(objk)/conf.o: $(srck)/conf.c $(objk)/conf.o: $(srck)/conf.c
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(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.tab.o: $(objk)/zconf.tab.c $(objk)/zconf.lex.c \
$(objk)/zconf.hash.c $(objk)/zconf.hash.c
@ -385,8 +373,5 @@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \
$(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ $(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: HOSTCFLAGS+=-I$(srck) -I$(objk)
$(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk) $(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk)

27
util/kconfig/Makefile.inc Normal file
View File

@ -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 $@ $<