Merge git://git.denx.de/u-boot-dm

master
Tom Rini 9 years ago
commit 05195b2cbe
  1. 2
      dts/Kconfig
  2. 5
      tools/patman/series.py

@ -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

@ -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,

Loading…
Cancel
Save