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>
This commit is contained in:
parent
cfce793052
commit
f411b701c5
|
@ -100,12 +100,12 @@ config FMD_GENPARSER
|
||||||
|
|
||||||
Otherwise, say N to use the provided pregenerated scanner/parser.
|
Otherwise, say N to use the provided pregenerated scanner/parser.
|
||||||
|
|
||||||
config SCONFIG_GENPARSER
|
config UTIL_GENPARSER
|
||||||
bool "Generate SCONFIG parser using flex and bison"
|
bool "Generate SCONFIG & BLOBTOOL parser using flex and bison"
|
||||||
default n
|
default n
|
||||||
help
|
help
|
||||||
Enable this option if you are working on the sconfig device tree
|
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.
|
Otherwise, say N to use the provided pregenerated scanner/parser.
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ $(objutil)/blobtool/%.o: $(objutil)/blobtool/%.c
|
||||||
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
|
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
|
||||||
$(HOSTCC) $(BLOBTOOL_FLAGS) $(HOSTCFLAGS) -c -o $@ $<
|
$(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
|
$(top)/util/blobtool/blobtool.lex.c_shipped: $(top)/util/blobtool/blobtool.l
|
||||||
printf " FLEX $(subst $(top)/,,$(@))\n"
|
printf " FLEX $(subst $(top)/,,$(@))\n"
|
||||||
flex -L -o $@ $<
|
flex -L -o $@ $<
|
||||||
|
|
|
@ -19,7 +19,7 @@ $(objutil)/sconfig/%.o: $(objutil)/sconfig/%.c
|
||||||
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
|
printf " HOSTCC $(subst $(obj)/,,$(@))\n"
|
||||||
$(HOSTCC) $(SCONFIGFLAGS) $(HOSTCFLAGS) -c -o $@ $<
|
$(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
|
$(top)/util/sconfig/lex.yy.c_shipped: $(top)/util/sconfig/sconfig.l
|
||||||
printf " FLEX $(subst $(top)/,,$(@))\n"
|
printf " FLEX $(subst $(top)/,,$(@))\n"
|
||||||
flex -L -o $@ $<
|
flex -L -o $@ $<
|
||||||
|
|
Loading…
Reference in New Issue