From 5f3f7b79dbe83144ef5562fa212266c86cd639e2 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 3 Feb 2016 20:51:36 +0900 Subject: [PATCH 1/2] dts: keep clock-names and clocks in SPL DTB if SPL_CLK is enabled These two properties are necessary for SPL to get clocks from DT. Note: For now, only clock look-up by index is supported (clk_get_by_index() function), so "clock-names" is never parsed in U-Boot. However, we may want to support something like clk_get_by_name() in the future, so let's keep "clock-names" as well as "clocks". Signed-off-by: Masahiro Yamada --- dts/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dts/Kconfig b/dts/Kconfig index fb2d79edbc3..d639be9a078 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -61,7 +61,9 @@ config DEFAULT_DEVICE_TREE config OF_SPL_REMOVE_PROPS string "List of device tree properties to drop for SPL" depends on SPL_OF_CONTROL + default "interrupt-parent" if SPL_PINCTRL_FULL && SPL_CLK default "clocks clock-names interrupt-parent" if SPL_PINCTRL_FULL + default "pinctrl-0 pinctrl-names interrupt-parent" if SPL_CLK default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent" help Since SPL normally runs in a reduced memory space, the device tree From 070b781b2beb5298cd904fd514ba50e8530b0e2c Mon Sep 17 00:00:00 2001 From: Albert ARIBAUD Date: Tue, 2 Feb 2016 10:24:53 +0100 Subject: [PATCH 2/2] patman: fix series-notes handling for buildman A patman series with a 'Series-notes' section causes buildman to crash with: self.series.notes += self.section TypeError: cannot concatenate 'str' and 'list' objects Fix by initializing series.notes as a one-element array rather than a scalar. Signed-off-by: Albert ARIBAUD Acked-by: Simon Glass Tested-by: Simon Glass --- tools/patman/series.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/patman/series.py b/tools/patman/series.py index 3399f2c8ddc..cc6f80b2fd4 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -69,7 +69,10 @@ class Series(dict): # Otherwise just set the value elif name in valid_series: - self[name] = value + if name=="notes": + self[name] = [value] + else: + self[name] = value else: raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid " "options are %s" % (commit.hash, line, name,