diff options
| author | Tom Rini <trini@konsulko.com> | 2016-12-20 08:42:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-12-20 08:42:04 -0500 |
| commit | 36737f22b78a475c6bbc8a0467b51e4d95b52a7d (patch) | |
| tree | 0983212512bde84015bff16e1e0900c359e004fa /arch/arm | |
| parent | 23465119610f47b469a3929c077ece5859f77455 (diff) | |
| parent | 68af10022442153f6f87958053fee030ad1cb57f (diff) | |
| download | u-boot-imx-36737f22b78a475c6bbc8a0467b51e4d95b52a7d.zip u-boot-imx-36737f22b78a475c6bbc8a0467b51e4d95b52a7d.tar.gz u-boot-imx-36737f22b78a475c6bbc8a0467b51e4d95b52a7d.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 14 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 15 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-nyan-big.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20.dtsi | 2 |
5 files changed, 37 insertions, 4 deletions
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi new file mode 100644 index 0000000..5adfd9b --- /dev/null +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -0,0 +1,14 @@ +#include <config.h> + +/ { + binman { + filename = "u-boot-sunxi-with-spl.bin"; + pad-byte = <0xff>; + blob { + filename = "spl/sunxi-spl.bin"; + }; + u-boot-img { + pos = <CONFIG_SPL_PAD_TO>; + }; + }; +}; diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi new file mode 100644 index 0000000..fff1d78 --- /dev/null +++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2016 Google, Inc + * Written by Simon Glass <sjg@chromium.org> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/ { + host1x@50000000 { + u-boot,dm-pre-reloc; + dc@54200000 { + u-boot,dm-pre-reloc; + }; + }; +}; diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts index 3758395..62f89d0 100644 --- a/arch/arm/dts/tegra124-nyan-big.dts +++ b/arch/arm/dts/tegra124-nyan-big.dts @@ -27,9 +27,7 @@ }; host1x@50000000 { - u-boot,dm-pre-reloc; dc@54200000 { - u-boot,dm-pre-reloc; display-timings { timing@0 { clock-frequency = <69500000>; diff --git a/arch/arm/dts/tegra20-u-boot.dtsi b/arch/arm/dts/tegra20-u-boot.dtsi new file mode 100644 index 0000000..9b9835d --- /dev/null +++ b/arch/arm/dts/tegra20-u-boot.dtsi @@ -0,0 +1,8 @@ +/ { + host1x@50000000 { + u-boot,dm-pre-reloc; + dc@54200000 { + u-boot,dm-pre-reloc; + }; + }; +}; diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi index 84bb1b0..e21ee25 100644 --- a/arch/arm/dts/tegra20.dtsi +++ b/arch/arm/dts/tegra20.dtsi @@ -10,7 +10,6 @@ interrupt-parent = <&lic>; host1x@50000000 { - u-boot,dm-pre-reloc; compatible = "nvidia,tegra20-host1x", "simple-bus"; reg = <0x50000000 0x00024000>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>, /* syncpt */ @@ -78,7 +77,6 @@ }; dc@54200000 { - u-boot,dm-pre-reloc; compatible = "nvidia,tegra20-dc"; reg = <0x54200000 0x00040000>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; |