diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-14 15:46:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-14 15:46:07 -0500 |
| commit | 15616a0aa58173bce1efe47569bf2e10d023ae9c (patch) | |
| tree | 57a9d4613a8534360816344cd0a331fd15649e80 /arch/arm/dts | |
| parent | 7ef548e6008d4225e0ae7c9af35cb76558756a62 (diff) | |
| parent | 854dfbf99b89c114ba100905e1500b8ace60e0f9 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/tegra-u-boot.dtsi | 40 | ||||
| -rw-r--r-- | arch/arm/dts/tegra114-u-boot.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-u-boot.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20-u-boot.dtsi | 11 | ||||
| -rw-r--r-- | arch/arm/dts/tegra210-u-boot.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/dts/tegra30-u-boot.dtsi | 3 |
7 files changed, 57 insertions, 8 deletions
diff --git a/arch/arm/dts/tegra-u-boot.dtsi b/arch/arm/dts/tegra-u-boot.dtsi new file mode 100644 index 0000000000..cde591c5fc --- /dev/null +++ b/arch/arm/dts/tegra-u-boot.dtsi @@ -0,0 +1,40 @@ +#include <config.h> + +/ { + binman { + multiple-images; + image1 { + filename = "u-boot-tegra.bin"; + pad-byte = <0xff>; + u-boot-spl { + }; + u-boot { + pos = <(CONFIG_SYS_TEXT_BASE - + CONFIG_SPL_TEXT_BASE)>; + }; + }; + + /* Same as image1 - some tools still expect the -dtb suffix */ + image2 { + filename = "u-boot-dtb-tegra.bin"; + pad-byte = <0xff>; + u-boot-spl { + }; + u-boot { + pos = <(CONFIG_SYS_TEXT_BASE - + CONFIG_SPL_TEXT_BASE)>; + }; + }; + + image3 { + filename = "u-boot-nodtb-tegra.bin"; + pad-byte = <0xff>; + u-boot-spl { + }; + u-boot-nodtb { + pos = <(CONFIG_SYS_TEXT_BASE - + CONFIG_SPL_TEXT_BASE)>; + }; + }; + }; +}; diff --git a/arch/arm/dts/tegra114-u-boot.dtsi b/arch/arm/dts/tegra114-u-boot.dtsi new file mode 100644 index 0000000000..7c11972552 --- /dev/null +++ b/arch/arm/dts/tegra114-u-boot.dtsi @@ -0,0 +1,3 @@ +#include <config.h> + +#include "tegra-u-boot.dtsi" diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi index 65c3851aff..44e64998c5 100644 --- a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi +++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi @@ -5,6 +5,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#include "tegra-u-boot.dtsi" + / { host1x@50000000 { u-boot,dm-pre-reloc; diff --git a/arch/arm/dts/tegra124-u-boot.dtsi b/arch/arm/dts/tegra124-u-boot.dtsi new file mode 100644 index 0000000000..7c11972552 --- /dev/null +++ b/arch/arm/dts/tegra124-u-boot.dtsi @@ -0,0 +1,3 @@ +#include <config.h> + +#include "tegra-u-boot.dtsi" diff --git a/arch/arm/dts/tegra20-u-boot.dtsi b/arch/arm/dts/tegra20-u-boot.dtsi index 9b9835da7e..7c11972552 100644 --- a/arch/arm/dts/tegra20-u-boot.dtsi +++ b/arch/arm/dts/tegra20-u-boot.dtsi @@ -1,8 +1,3 @@ -/ { - host1x@50000000 { - u-boot,dm-pre-reloc; - dc@54200000 { - u-boot,dm-pre-reloc; - }; - }; -}; +#include <config.h> + +#include "tegra-u-boot.dtsi" diff --git a/arch/arm/dts/tegra210-u-boot.dtsi b/arch/arm/dts/tegra210-u-boot.dtsi new file mode 100644 index 0000000000..7c11972552 --- /dev/null +++ b/arch/arm/dts/tegra210-u-boot.dtsi @@ -0,0 +1,3 @@ +#include <config.h> + +#include "tegra-u-boot.dtsi" diff --git a/arch/arm/dts/tegra30-u-boot.dtsi b/arch/arm/dts/tegra30-u-boot.dtsi new file mode 100644 index 0000000000..7c11972552 --- /dev/null +++ b/arch/arm/dts/tegra30-u-boot.dtsi @@ -0,0 +1,3 @@ +#include <config.h> + +#include "tegra-u-boot.dtsi" |