The old style syntax for plugins is still out in the wild.
This patch transparently support it.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
---
dtc-parser.y | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/dtc-parser.y b/dtc-parser.y
index 2890c1c..4a67baf 100644
--- a/dtc-parser.y
+++ b/dtc-parser.y
@@ -77,6 +77,7 @@ extern unsigned int the_versionflags;
%type <data> propdataprefix
%type <flags> versioninfo
%type <flags> plugindecl
+%type <flags> oldplugindecl
%type <re> memreserve
%type <re> memreserves
%type <array> arrayprefix
@@ -107,10 +108,10 @@ extern unsigned int the_versionflags;
%%
sourcefile:
- versioninfo ';' memreserves devicetree
+ versioninfo ';' oldplugindecl memreserves devicetree
{
- the_boot_info = build_boot_info($1, $3, $4,
- guess_boot_cpuid($4));
+ the_boot_info = build_boot_info($1 | $3, $4, $5,
+ guess_boot_cpuid($5));
}
;
@@ -134,6 +135,18 @@ plugindecl:
}
;
+oldplugindecl:
+ DT_PLUGIN ';'
+ {
+ the_versionflags |= VF_PLUGIN;
+ $$ = VF_PLUGIN;
+ }
+ | /* empty */
+ {
+ $$ = 0;
+ }
+ ;
+
memreserves:
/* empty */
{--
1.7.12