leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dtoc: Make GetArgs() more flexible

Browse Source 
At present it is not possible to have arguments which include spaces.
Update the function to only split the args if the property is a single
string. This is a bit inconsistent, but might still be useful.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Suggested-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
Simon Glass 2022-03-05 20:18:52 -07:00
parent 04fce6ff70
commit 6101253818
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/dtoc/fdt_util.py
View File

@ -192,8 +192,12 @@ def GetArgs(node, propname):
value = GetStringList(node, propname) value = GetStringList(node, propname)
else: else:
value = [] value = []
lists = [v.split() for v in value] if not value:
args = [x for l in lists for x in l] args = []
elif len(value) == 1:
args = value[0].split()
else:
args = value
return args return args
def GetBool(node, propname, default=False): def GetBool(node, propname, default=False):

2
tools/dtoc/test/dtoc_test_simple.dts
View File

@ -63,5 +63,7 @@
orig-node { orig-node {
orig = <1 23 4>; orig = <1 23 4>;
args = "-n first", "second", "-p", "123,456", "-x"; args = "-n first", "second", "-p", "123,456", "-x";
args2 = "a space", "there";
args3 = "-n first second -p 123,456 -x";
}; };
}; };

6
tools/dtoc/test_fdt.py
View File

@ -659,8 +659,12 @@ class TestFdtUtil(unittest.TestCase):
['multi-word', 'message'], ['multi-word', 'message'],
fdt_util.GetArgs(self.node, 'stringarray')) fdt_util.GetArgs(self.node, 'stringarray'))
self.assertEqual([], fdt_util.GetArgs(self.node, 'boolval')) self.assertEqual([], fdt_util.GetArgs(self.node, 'boolval'))
self.assertEqual(['-n', 'first', 'second', '-p', '123,456', '-x'], self.assertEqual(['-n first', 'second', '-p', '123,456', '-x'],
fdt_util.GetArgs(node, 'args')) fdt_util.GetArgs(node, 'args'))
self.assertEqual(['a space', 'there'],
fdt_util.GetArgs(node, 'args2'))
self.assertEqual(['-n', 'first', 'second', '-p', '123,456', '-x'],
fdt_util.GetArgs(node, 'args3'))
with self.assertRaises(ValueError) as exc: with self.assertRaises(ValueError) as exc:
fdt_util.GetArgs(self.node, 'missing') fdt_util.GetArgs(self.node, 'missing')
self.assertIn( self.assertIn(