coreboot-mirror
/
libgfxinit
mirror of https://review.coreboot.org/libgfxinit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sed: Get rid of \| 

It turned out that \| is not part of POSIX Basic Regular Expressions.
We'll have to explicitly specify individual sed scripts per case, at
least `make` assists us with some repetition.

Change-Id: Ifb24d0d5aa0e2a0a231ce0fc7c5dddc3e28088a5
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/libgfxinit/+/55467
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Nico Huber 2021-06-13 20:56:03 +00:00
parent f20f5fc66e
commit c47872c656
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/Makefile.inc
View File

@ -62,7 +62,7 @@ CONFIG_GFX_GMA_PANEL_2_PORT := $(call strip_quotes,$(CONFIG_GFX_GMA_PANEL_2_PORT
CONFIG_GFX_GMA_ANALOG_I2C_PORT := $(call strip_quotes,$(CONFIG_GFX_GMA_ANALOG_I2C_PORT))
CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS := $(if $(filter y,$(CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS)),True,False)
_GEN_TLA_SUBSTITUTIONS := \(g45\|ilk\|hsw\|skl\)
_GEN_TLA_SUBSTITUTIONS := g45 ilk hsw skl
_GEN_NONCONST := $(strip \
$(if $(filter G45,$(CONFIG_GFX_GMA_GENERATION)),g45, \
@ -94,9 +94,11 @@ $(hw-gfx-gma-config-ads): $(dir)/hw-gfx-gma-config.ads.template $(cnf)
sed $(GFX_GMA_COMMON_SUBSTITUTIONS) \
-e'/constant Gen_CPU/d' \
-e's/<genbool>/constant Boolean/' \
-e's/<\($(_GEN_TLA_SUBSTITUTIONS)\(...\)*\)bool>/<\1var> Boolean/' \
$(foreach gen,$(_GEN_TLA_SUBSTITUTIONS), \
-e's/<\($(gen)\(...\)*\)bool>/<\1var> Boolean/') \
$(if $(_GEN_NONCONST),-e's/<\(...\)*$(_GEN_NONCONST)\(...\)*var>/<cpufunc>/') \
-e's/<$(_GEN_TLA_SUBSTITUTIONS)\(...\)*var>/$(_GEN_CONST_TARGET)/' \
$(foreach gen,$(_GEN_TLA_SUBSTITUTIONS), \
-e's/<$(gen)\(...\)*var>/$(_GEN_CONST_TARGET)/') \
-e's/\(.*: *<cpufunc>.*:=\) *\(.*\);/\1\n (\2);/' \
-e's/\([^ ]\+\) *: *<cpufunc> \+\([^ ]*\) *:=/function \1 return \2 is/' \
-e's/<cpunull>//' \
@ -107,8 +109,10 @@ $(hw-gfx-gma-config-ads): $(dir)/hw-gfx-gma-config.ads.template $(cnf)
sed $(GFX_GMA_COMMON_SUBSTITUTIONS) \
-e's/<<CPU>>/$(CONFIG_GFX_GMA_CPU)/' \
-e's/<<CPU_VARIANT>>/$(CONFIG_GFX_GMA_CPU_VARIANT)/' \
-e's/<\(gen\|$(_GEN_TLA_SUBSTITUTIONS)\(...\)*\)bool>/constant Boolean/' \
-e's/<\($(_GEN_TLA_SUBSTITUTIONS)\(...\)*\)var>/constant/' \
-e's/<genbool>/constant Boolean/' \
$(foreach gen,$(_GEN_TLA_SUBSTITUTIONS), \
-e's/<$(gen)\(...\)*bool>/constant Boolean/' \
-e's/<$(gen)\(...\)*var>/constant/') \
-e's/<cpunull>/ is null/' \
-f $(dir $<)/delete_dyncpu.sed \
$< >$@