diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-25 10:35:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-25 10:35:23 -0500 |
| commit | 05195b2cbe5e8bd6df164503a4da9c84a7fe066f (patch) | |
| tree | c418484fdf52898ea7088e717c0499cd028130ad | |
| parent | 299e5bb7c2377aa3d3b1ae74bceafadad71e8863 (diff) | |
| parent | 070b781b2beb5298cd904fd514ba50e8530b0e2c (diff) | |
Merge git://git.denx.de/u-boot-dm
| -rw-r--r-- | dts/Kconfig | 2 | ||||
| -rw-r--r-- | tools/patman/series.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/dts/Kconfig b/dts/Kconfig index fb2d79edbc..d639be9a07 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 diff --git a/tools/patman/series.py b/tools/patman/series.py index 3399f2c8dd..cc6f80b2fd 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, |