kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove support for the legacy DTS source file format. 

Now that all in-kernel-tree DTS files are properly /dts-v1/,
remove direct support for the older, un-numbered DTS
source file format.

Convert existing tests to /dts-v1/ and remove support
for the conversion tests themselves.

For now, though, the conversion tool still exists.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
main
Jon Loeliger 17 years ago
parent
e5c8e1dcd7
commit
4e1a0a0129
10 changed files with 77 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      dtc-lexer.l
  2. 46
      dtc-parser.y
  3. 24
      tests/base01.dts
  4. 2
      tests/empty.dts
  5. 2
      tests/escapes.dts
  6. 38
      tests/label01.dts
  7. 12
      tests/references_dts0.dts
  8. 27
      tests/run_tests.sh
  9. 38
      tests/test01.dts
  10. 18
      tests/test_tree1_dts0.dts

34
dtc-lexer.l
Unescape View File

@ -52,15 +52,10 @@ LINECOMMENT "//".*\n
#define DPRINT(fmt, ...) do { } while (0) #define DPRINT(fmt, ...) do { } while (0)
#endif #endif


static int dts_version; /* = 0 */ static int dts_version = 1;


#define BEGIN_DEFAULT() if (dts_version == 0) { \ #define BEGIN_DEFAULT() DPRINT("<V1>\n"); \
DPRINT("<INITIAL>\n"); \
BEGIN(INITIAL); \
} else { \
DPRINT("<V1>\n"); \
BEGIN(V1); \ BEGIN(V1); \
}


static void push_input_file(const char *filename); static void push_input_file(const char *filename);
static int pop_input_file(void); static int pop_input_file(void);
@ -106,25 +101,6 @@ static int pop_input_file(void);
return DT_LABEL; return DT_LABEL;
} }


<INITIAL>[bodh]# {
if (*yytext == 'b')
yylval.cbase = 2;
else if (*yytext == 'o')
yylval.cbase = 8;
else if (*yytext == 'd')
yylval.cbase = 10;
else
yylval.cbase = 16;
DPRINT("Base: %d\n", yylval.cbase);
return DT_BASE;
}

<INITIAL>[0-9a-fA-F]+ {
yylval.literal = xstrdup(yytext);
DPRINT("Literal: '%s'\n", yylval.literal);
return DT_LEGACYLITERAL;
}

<V1>[0-9]+|0[xX][0-9a-fA-F]+ { <V1>[0-9]+|0[xX][0-9a-fA-F]+ {
yylval.literal = xstrdup(yytext); yylval.literal = xstrdup(yytext);
DPRINT("Literal: '%s'\n", yylval.literal); DPRINT("Literal: '%s'\n", yylval.literal);
@ -144,12 +120,6 @@ static int pop_input_file(void);
return DT_REF; return DT_REF;
} }


<INITIAL>"&/"{PATHCHAR}+ { /* old-style path reference */
DPRINT("Ref: %s\n", yytext+1);
yylval.labelref = xstrdup(yytext+1);
return DT_REF;
}

<BYTESTRING>[0-9a-fA-F]{2} { <BYTESTRING>[0-9a-fA-F]{2} {
yylval.byte = strtol(yytext, NULL, 16); yylval.byte = strtol(yytext, NULL, 16);
DPRINT("Byte: %02x\n", (int)yylval.byte); DPRINT("Byte: %02x\n", (int)yylval.byte);

46
dtc-parser.y
Unescape View File

@ -56,7 +56,6 @@ static unsigned long long eval_literal(const char *s, int base, int bits);
%token DT_MEMRESERVE %token DT_MEMRESERVE
%token <propnodename> DT_PROPNODENAME %token <propnodename> DT_PROPNODENAME
%token <literal> DT_LITERAL %token <literal> DT_LITERAL
%token <literal> DT_LEGACYLITERAL
%token <cbase> DT_BASE %token <cbase> DT_BASE
%token <byte> DT_BYTE %token <byte> DT_BYTE
%token <data> DT_STRING %token <data> DT_STRING
@ -68,11 +67,8 @@ static unsigned long long eval_literal(const char *s, int base, int bits);
%type <data> propdataprefix %type <data> propdataprefix
%type <re> memreserve %type <re> memreserve
%type <re> memreserves %type <re> memreserves
%type <re> v0_memreserve
%type <re> v0_memreserves
%type <addr> addr %type <addr> addr
%type <data> celllist %type <data> celllist
%type <cbase> cellbase
%type <cell> cellval %type <cell> cellval
%type <data> bytestring %type <data> bytestring
%type <prop> propdef %type <prop> propdef
@ -91,10 +87,6 @@ sourcefile:
{ {
the_boot_info = build_boot_info($3, $4, 0); the_boot_info = build_boot_info($3, $4, 0);
} }
| v0_memreserves devicetree
{
the_boot_info = build_boot_info($1, $2, 0);
}
; ;


memreserves: memreserves:
@ -115,37 +107,11 @@ memreserve:
} }
; ;


v0_memreserves:
/* empty */
{
$$ = NULL;
}
| v0_memreserve v0_memreserves
{
$$ = chain_reserve_entry($1, $2);
};
;

v0_memreserve:
memreserve
{
$$ = $1;
}
| label DT_MEMRESERVE addr '-' addr ';'
{
$$ = build_reserve_entry($3, $5 - $3 + 1, $1);
}
;

addr: addr:
DT_LITERAL DT_LITERAL
{ {
$$ = eval_literal($1, 0, 64); $$ = eval_literal($1, 0, 64);
} }
| DT_LEGACYLITERAL
{
$$ = eval_literal($1, 16, 64);
}
; ;


devicetree: devicetree:
@ -272,23 +238,11 @@ celllist:
} }
; ;


cellbase:
/* empty */
{
$$ = 16;
}
| DT_BASE
;

cellval: cellval:
DT_LITERAL DT_LITERAL
{ {
$$ = eval_literal($1, 0, 32); $$ = eval_literal($1, 0, 32);
} }
| cellbase DT_LEGACYLITERAL
{
$$ = eval_literal($2, $1, 32);
}
; ;


bytestring: bytestring:

24
tests/base01.dts
Unescape View File

@ -1,3 +1,5 @@
/dts-v1/;

/ { / {
model = "SomeModel"; model = "SomeModel";
compatible = "Nothing"; compatible = "Nothing";
@ -6,26 +8,26 @@


memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <00000000 00000000 00000000 20000000>; reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
}; };


cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
d10 = <d# 10>; // hex: 0xa d10 = < 10>; // hex: 0xa
d23 = <d# 23>; // hex: 0x17 d23 = < 23>; // hex: 0x17
b101 = <b# 101>; // hex: 0x5 b101 = < 0x5>; // hex: 0x5
o17 = <o# 17>; // hex: 0xf o17 = < 017>; // hex: 0xf
hd00d = <h# d00d>; // hex: 0xd00d hd00d = < 0xd00d>; // hex: 0xd00d


// hex: 0x4d2 0x163e 0x2334 0xd80 // hex: 0x4d2 0x163e 0x2334 0xd80
stuff = <d# 1234 d# 5678 d# 9012 d# 3456>; stuff = < 1234 5678 9012 3456>;




bad-d-1 = <d# abc123>; // Hrm. 0 bad-d-1 = < 0>; // Hrm. 0
bad-d-2 = <d# 123456789012345>; bad-d-2 = < 123456789012345>;
bad-o-1 = <o# 891>; bad-o-1 = < 00>;
bad-o-2 = <o# 123456123456>; bad-o-2 = < 0123456123456>;
}; };


}; };

2
tests/empty.dts
Unescape View File

@ -1,2 +1,4 @@
/dts-v1/;

/ { / {
}; };

2
tests/escapes.dts
Unescape View File

@ -1,3 +1,5 @@
/dts-v1/;

/ { / {
compatible = "test_string_escapes"; compatible = "test_string_escapes";
escape-str = "nastystring: \a\b\t\n\v\f\r\\\""; escape-str = "nastystring: \a\b\t\n\v\f\r\\\"";

38
tests/label01.dts
Unescape View File

@ -1,6 +1,8 @@
/memreserve/ 1000000000000000 0000000002000000; /dts-v1/;
memrsv2: /memreserve/ 2000000000000000-20ffffffffffffff;
/memreserve/ 0-13; /memreserve/ 0x1000000000000000 0x0000000002000000;
memrsv2: /memreserve/ 0x2000000000000000 0x0100000000000000;
/memreserve/ 0x0000000000000000 0x0000000000000014;


/ { / {
model = "MyBoardName"; model = "MyBoardName";
@ -9,28 +11,28 @@ memrsv2: /memreserve/ 2000000000000000-20ffffffffffffff;
#size-cells = <2>; #size-cells = <2>;


cpus { cpus {
linux,phandle = <1>; linux,phandle = <0x1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,970@0 { PowerPC,970@0 {
name = "PowerPC,970"; name = "PowerPC,970";
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0x00000000>;
clock-frequency = <5f5e1000>; clock-frequency = <1600000000>;
timebase-frequency = <1FCA055>; timebase-frequency = <33333333>;
linux,boot-cpu; linux,boot-cpu;
i-cache-size = <10000>; i-cache-size = <65536>;
d-cache-size = <8000>; d-cache-size = <32768>;
}; };


PowerPC,970@1 { PowerPC,970@1 {
name = "PowerPC,970"; name = "PowerPC,970";
device_type = "cpu"; device_type = "cpu";
reg = <1>; reg = <0x00000001>;
clock-frequency = <5f5e1000>; clock-frequency = <1600000000>;
timebase-frequency = <1FCA055>; timebase-frequency = <33333333>;
i-cache-size = <10000>; i-cache-size = <65536>;
d-cache-size = <8000>; d-cache-size = <32768>;
}; };


}; };
@ -38,8 +40,8 @@ memrsv2: /memreserve/ 2000000000000000-20ffffffffffffff;
node: randomnode { node: randomnode {
prop: string = str: "foo", str_mid: "stuffstuff\t\t\t\n\n\n" str_end: ; prop: string = str: "foo", str_mid: "stuffstuff\t\t\t\n\n\n" str_end: ;
blob = [byte: 0a 0b 0c 0d byte_mid: de ea ad be ef byte_end: ]; blob = [byte: 0a 0b 0c 0d byte_mid: de ea ad be ef byte_end: ];
ref = < cell: &/memory@0 0 cell_mid: ffffffff cell_end: >; ref = < cell: &{/memory@0} 0x0 cell_mid: 0xffffffff cell_end: >;
mixed = "abc", pre: [1234] post: , gap: < aligned: a b c>; mixed = "abc", pre: [1234] post: , gap: < aligned: 0xa 0xb 0xc>;
tricky1 = [61 lt1: 62 63 00]; tricky1 = [61 lt1: 62 63 00];
subnode: child { subnode: child {
}; };
@ -49,12 +51,12 @@ memrsv2: /memreserve/ 2000000000000000-20ffffffffffffff;


memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
memreg: reg = <00000000 00000000 00000000 20000000>; memreg: reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
}; };


chosen { chosen {
bootargs = "root=/dev/sda2"; bootargs = "root=/dev/sda2";
linux,platform = <00000600>; linux,platform = <0x600>;
}; };


}; };

12
tests/references_dts0.dts
Unescape View File

@ -1,19 +1,21 @@
/dts-v1/;

/ { / {
/* Explicit phandles */ /* Explicit phandles */
n1: node1 { n1: node1 {
linux,phandle = <2000>; linux,phandle = <0x2000>;
ref = <&/node2>; /* reference precedes target */ ref = <&{/node2}>; /* reference precedes target */
lref = <&n2>; lref = <&n2>;
}; };
n2: node2 { n2: node2 {
linux,phandle = <1>; linux,phandle = <0x1>;
ref = <&/node1>; /* reference after target */ ref = <&{/node1}>; /* reference after target */
lref = <&n1>; lref = <&n1>;
}; };


/* Implicit phandles */ /* Implicit phandles */
n3: node3 { n3: node3 {
ref = <&/node4>; ref = <&{/node4}>;
lref = <&n4>; lref = <&n4>;
}; };
n4: node4 { n4: node4 {

27
tests/run_tests.sh
Unescape View File

@ -71,13 +71,6 @@ run_dtc_test () {
base_run_test wrap_test $VALGRIND $DTC "$@" base_run_test wrap_test $VALGRIND $DTC "$@"
} }


CONVERT=../convert-dtsv0

run_convert_test () {
echo -n "convert-dtsv0 $@: "
base_run_test wrap_test $VALGRIND $CONVERT "$@"
}

tree1_tests () { tree1_tests () {
TREE=$1 TREE=$1


@ -288,21 +281,6 @@ dtc_tests () {
run_sh_test dtc-fatal.sh -I fs -O dtb nosuchfile run_sh_test dtc-fatal.sh -I fs -O dtb nosuchfile
} }


convert_tests () {
V0_DTS="test_tree1_dts0.dts references_dts0.dts empty.dts escapes.dts \
test01.dts label01.dts"
for dts in $V0_DTS; do
run_dtc_test -I dts -O dtb -o cvtraw_$dts.test.dtb $dts
run_dtc_test -I dts -O dts -o cvtdtc_$dts.test.dts $dts
run_dtc_test -I dts -O dtb -o cvtdtc_$dts.test.dtb cvtdtc_$dts.test.dts
run_convert_test $dts
run_dtc_test -I dts -O dtb -o cvtcvt_$dts.test.dtb ${dts}v1

run_wrap_test cmp cvtraw_$dts.test.dtb cvtdtc_$dts.test.dtb
run_wrap_test cmp cvtraw_$dts.test.dtb cvtcvt_$dts.test.dtb
done
}

while getopts "vt:m" ARG ; do while getopts "vt:m" ARG ; do
case $ARG in case $ARG in
"v") "v")
@ -318,7 +296,7 @@ while getopts "vt:m" ARG ; do
done done


if [ -z "$TESTSETS" ]; then if [ -z "$TESTSETS" ]; then
TESTSETS="libfdt dtc convert" TESTSETS="libfdt dtc"
fi fi


# Make sure we don't have stale blobs lying around # Make sure we don't have stale blobs lying around
@ -332,9 +310,6 @@ for set in $TESTSETS; do
"dtc") "dtc")
dtc_tests dtc_tests
;; ;;
"convert")
convert_tests
;;
esac esac
done done



38
tests/test01.dts
Unescape View File

@ -1,6 +1,8 @@
/memreserve/ 1000000000000000 0000000002000000; /dts-v1/;
/memreserve/ 2000000000000000-20ffffffffffffff;
/memreserve/ 0-13; /memreserve/ 0x1000000000000000 0x0000000002000000;
/memreserve/ 0x2000000000000000 0x0100000000000000;
/memreserve/ 0x0000000000000000 0x0000000000000014;


/ { / {
model = "MyBoardName"; model = "MyBoardName";
@ -9,28 +11,28 @@
#size-cells = <2>; #size-cells = <2>;


cpus { cpus {
linux,phandle = <1>; linux,phandle = <0x1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,970@0 { PowerPC,970@0 {
name = "PowerPC,970"; name = "PowerPC,970";
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0x00000000>;
clock-frequency = <5f5e1000>; clock-frequency = <1600000000>;
timebase-frequency = <1FCA055>; timebase-frequency = <33333333>;
linux,boot-cpu; linux,boot-cpu;
i-cache-size = <10000>; i-cache-size = <65536>;
d-cache-size = <8000>; d-cache-size = <32768>;
}; };


PowerPC,970@1 { PowerPC,970@1 {
name = "PowerPC,970"; name = "PowerPC,970";
device_type = "cpu"; device_type = "cpu";
reg = <1>; reg = <0x00000001>;
clock-frequency = <5f5e1000>; clock-frequency = <1600000000>;
timebase-frequency = <1FCA055>; timebase-frequency = <33333333>;
i-cache-size = <10000>; i-cache-size = <65536>;
d-cache-size = <8000>; d-cache-size = <32768>;
}; };


}; };
@ -38,18 +40,18 @@
randomnode { randomnode {
string = "\xff\0stuffstuff\t\t\t\n\n\n"; string = "\xff\0stuffstuff\t\t\t\n\n\n";
blob = [0a 0b 0c 0d de ea ad be ef]; blob = [0a 0b 0c 0d de ea ad be ef];
ref = < &/memory@0 >; ref = < &{/memory@0} >;
mixed = "abc", [1234], <a b c>; mixed = "abc", [1234], <0xa 0xb 0xc>;
}; };


memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
memreg: reg = <00000000 00000000 00000000 20000000>; memreg: reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
}; };


chosen { chosen {
bootargs = "root=/dev/sda2"; bootargs = "root=/dev/sda2";
linux,platform = <00000600>; linux,platform = <0x600>;
}; };


}; };

18
tests/test_tree1_dts0.dts
Unescape View File

@ -1,9 +1,11 @@
/memreserve/ deadbeef00000000-deadbeef000fffff; /dts-v1/;
/memreserve/ 75bcd15 1000;
/memreserve/ 0xdeadbeef00000000 0x0000000000100000;
/memreserve/ 0x00000000075bcd15 0x0000000000001000;


/ { / {
compatible = "test_tree1"; compatible = "test_tree1";
prop-int = <deadbeef>; prop-int = <0xdeadbeef>;
prop-str = "hello world"; prop-str = "hello world";


subnode@1 { subnode@1 {
@ -12,18 +14,18 @@


subsubnode { subsubnode {
compatible = "subsubnode1", "subsubnode"; compatible = "subsubnode1", "subsubnode";
prop-int = <h# deadbeef>; prop-int = < 0xdeadbeef>;
}; };
}; };


subnode@2 { subnode@2 {
linux,phandle = <2000>; linux,phandle = <0x2000>;
prop-int = <d# 123456789>; prop-int = < 123456789>;


subsubnode@0 { subsubnode@0 {
linux,phandle = <2001>; linux,phandle = <0x2001>;
compatible = "subsubnode2", "subsubnode"; compatible = "subsubnode2", "subsubnode";
prop-int = <o# 0726746425>; prop-int = < 0726746425>;
}; };
}; };
}; };

Write Preview
Loading…
Cancel
Save