diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-13 08:27:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-13 08:27:35 -0400 |
| commit | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (patch) | |
| tree | f4c9c40f9353fbe4104875779c7eedd3ed2342cc /dts | |
| parent | 0a5228be868622894a5f8f226203cd7bac562187 (diff) | |
| parent | 73c02e5e4fc1ef53d06289232edd6cc52e3d73f6 (diff) | |
| download | u-boot-cf5eebeb18f7790d5030eb94f51fca0ebcd6e406.tar.gz | |
Merge tag 'pull-12apr19' of git://git.denx.de/u-boot-dm
fdtdec tests and improvements for carve-outs
pinctrl race-condition fix
various other fixes in sandbox, sound, mkimage, etc.
Diffstat (limited to 'dts')
| -rw-r--r-- | dts/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dts/Kconfig b/dts/Kconfig index a5f30c8fd0..c9ab66cccc 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -291,10 +291,10 @@ config SPL_MULTI_DTB_FIT_USER_DEF_ADDR 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 && 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" + default "interrupt-parent interrupts" if SPL_PINCTRL && SPL_CLK + default "clocks clock-names interrupt-parent interrupts" if SPL_PINCTRL + default "pinctrl-0 pinctrl-names interrupt-parent interrupts" if SPL_CLK + default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent interrupts" help Since SPL normally runs in a reduced memory space, the device tree is cut down to only what is needed to load and start U-Boot. Only |