diff options
| author | Martin Roth <martinroth@google.com> | 2017-04-09 19:12:42 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-04-14 17:26:48 +0200 |
| commit | f411b701c5e65c9875b0ac1135fb64fbfc7f3d57 (patch) | |
| tree | bfcd73485cee05bce5cb8ecd47a7f96f89a2a3ad | |
| parent | cfce7930520610dd91291ce54b3ef62ce7565707 (diff) | |
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@google.com>
Reviewed-on: https://review.coreboot.org/19229
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/Kconfig | 6 | ||||
| -rw-r--r-- | util/blobtool/Makefile.inc | 2 | ||||
| -rw-r--r-- | util/sconfig/Makefile.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Kconfig b/src/Kconfig index cdc0a4426f..7dc738fbd2 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -100,12 +100,12 @@ config FMD_GENPARSER 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 74777a56cd..34340412c8 100644 --- a/util/blobtool/Makefile.inc +++ b/util/blobtool/Makefile.inc @@ -16,7 +16,7 @@ $(objutil)/blobtool/%.o: $(objutil)/blobtool/%.c 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 c6ba90f450..76bbd45674 100644 --- a/util/sconfig/Makefile.inc +++ b/util/sconfig/Makefile.inc @@ -19,7 +19,7 @@ $(objutil)/sconfig/%.o: $(objutil)/sconfig/%.c 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 $@ $< |