diff options
author | Tom Rini <trini@konsulko.com> | 2017-04-05 08:28:33 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-04-05 08:28:33 -0400 |
commit | 433647a7ef9241b963b4636e7f8c3a2159d156f0 (patch) | |
tree | 15008cb530f46b5f9711efa2d9fc550b11ce2905 /dts/Kconfig | |
parent | 7da8680b260b4598d841d9a8432d95d56cb86d9f (diff) | |
parent | 239ae4a9129b8b9f24a216e127042b255b07ae59 (diff) | |
download | u-boot-433647a7ef9241b963b4636e7f8c3a2159d156f0.tar.gz |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'dts/Kconfig')
-rw-r--r-- | dts/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dts/Kconfig b/dts/Kconfig index 3f64eda619..6fe7a5bc08 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -83,8 +83,8 @@ config OF_LIST 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 "interrupt-parent" if SPL_PINCTRL && SPL_CLK + default "clocks clock-names interrupt-parent" if SPL_PINCTRL default "pinctrl-0 pinctrl-names interrupt-parent" if SPL_CLK default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent" help |