[coreboot-gerrit] Change in coreboot[master]: util/blobtool & sconfig: Update GENPARSER Kconfig question
Martin Roth (Code Review)
gerrit at coreboot.org
Fri Apr 14 17:26:51 CEST 2017
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/19229 )
Change subject: util/blobtool & sconfig: Update GENPARSER Kconfig question
......................................................................
util/blobtool & sconfig: Update GENPARSER Kconfig question
blobtool uses the same sort of update mechanism for the .l & .y files,
so update the SCONFIG_GENPARSER Kconfig question to encompass both
utilities.
- Change the name to UTIL_GENPARSER, and update the help text.
- Update sconfig's makefile.
- Add the check to blobtool's makefile.
- Update the makefiles to check for y, not defined.
Change-Id: I6215791c9a019bce37d4a150b65d1fdbb9073156
Signed-off-by: Martin Roth <martinroth at google.com>
Reviewed-on: https://review.coreboot.org/19229
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi at google.com>
---
M src/Kconfig
M util/blobtool/Makefile.inc
M util/sconfig/Makefile.inc
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
build bot (Jenkins): Verified
Patrick Georgi: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig
index cdc0a44..7dc738f 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -100,12 +100,12 @@
Otherwise, say N to use the provided pregenerated scanner/parser.
-config SCONFIG_GENPARSER
- bool "Generate SCONFIG parser using flex and bison"
+config UTIL_GENPARSER
+ bool "Generate SCONFIG & BLOBTOOL parser using flex and bison"
default n
help
Enable this option if you are working on the sconfig device tree
- parser and made changes to sconfig.l or sconfig.y.
+ parser or blobtool and made changes to the .l or .y files.
Otherwise, say N to use the provided pregenerated scanner/parser.
diff --git a/util/blobtool/Makefile.inc b/util/blobtool/Makefile.inc
index 74777a5..3434041 100644
--- a/util/blobtool/Makefile.inc
+++ b/util/blobtool/Makefile.inc
@@ -16,7 +16,7 @@
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
$(HOSTCC) $(BLOBTOOL_FLAGS) $(HOSTCFLAGS) -c -o $@ $<
-ifeq (0,1)
+ifeq ($(CONFIG_UTIL_GENPARSER),y)
$(top)/util/blobtool/blobtool.lex.c_shipped: $(top)/util/blobtool/blobtool.l
printf " FLEX $(subst $(top)/,,$(@))\n"
flex -L -o $@ $<
diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.inc
index c6ba90f..76bbd45 100644
--- a/util/sconfig/Makefile.inc
+++ b/util/sconfig/Makefile.inc
@@ -19,7 +19,7 @@
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
$(HOSTCC) $(SCONFIGFLAGS) $(HOSTCFLAGS) -c -o $@ $<
-ifdef CONFIG_SCONFIG_GENPARSER
+ifeq ($(CONFIG_UTIL_GENPARSER),y)
$(top)/util/sconfig/lex.yy.c_shipped: $(top)/util/sconfig/sconfig.l
printf " FLEX $(subst $(top)/,,$(@))\n"
flex -L -o $@ $<
--
To view, visit https://review.coreboot.org/19229
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6215791c9a019bce37d4a150b65d1fdbb9073156
Gerrit-PatchSet: 3
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Damien Zammit <damien at zamaudio.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: Patrick Rudolph <siro at das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins)
More information about the coreboot-gerrit
mailing list