mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-17 22:49:02 +00:00
imx: Drop unneeded phandle in FIT template
Adding a phandle to a template node is not allowed, since when the node is instantiated multiple times, we end up with duplicate phandles. Drop this invalid constructs. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
parent
fa140172cb
commit
98244a8550
7 changed files with 13 additions and 9 deletions
|
@ -41,9 +41,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* This cannot work since it refers to a template node
|
||||||
&binman_configuration {
|
&binman_configuration {
|
||||||
loadables = "atf", "fip";
|
loadables = "atf", "fip";
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
&fec1 {
|
&fec1 {
|
||||||
phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
|
phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
|
||||||
|
|
|
@ -140,7 +140,7 @@
|
||||||
configurations {
|
configurations {
|
||||||
default = "@config-DEFAULT-SEQ";
|
default = "@config-DEFAULT-SEQ";
|
||||||
|
|
||||||
binman_configuration: @config-SEQ {
|
@config-SEQ {
|
||||||
description = "NAME";
|
description = "NAME";
|
||||||
fdt = "fdt-SEQ";
|
fdt = "fdt-SEQ";
|
||||||
firmware = "uboot";
|
firmware = "uboot";
|
||||||
|
|
|
@ -204,7 +204,7 @@
|
||||||
configurations {
|
configurations {
|
||||||
default = "@config-DEFAULT-SEQ";
|
default = "@config-DEFAULT-SEQ";
|
||||||
|
|
||||||
binman_configuration: @config-SEQ {
|
@config-SEQ {
|
||||||
description = "NAME";
|
description = "NAME";
|
||||||
fdt = "fdt-SEQ";
|
fdt = "fdt-SEQ";
|
||||||
firmware = "uboot";
|
firmware = "uboot";
|
||||||
|
|
|
@ -162,6 +162,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* This cannot work since it refers to a template node
|
||||||
&binman_configuration {
|
&binman_configuration {
|
||||||
loadables = "atf", "fip";
|
loadables = "atf", "fip";
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
|
|
@ -146,7 +146,7 @@
|
||||||
type = "flat_dt";
|
type = "flat_dt";
|
||||||
compression = "none";
|
compression = "none";
|
||||||
|
|
||||||
uboot_fdt_blob: blob-ext {
|
blob-ext {
|
||||||
filename = "u-boot.dtb";
|
filename = "u-boot.dtb";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -155,7 +155,7 @@
|
||||||
configurations {
|
configurations {
|
||||||
default = "@config-DEFAULT-SEQ";
|
default = "@config-DEFAULT-SEQ";
|
||||||
|
|
||||||
binman_configuration: @config-SEQ {
|
@config-SEQ {
|
||||||
description = "NAME";
|
description = "NAME";
|
||||||
fdt = "fdt-SEQ";
|
fdt = "fdt-SEQ";
|
||||||
firmware = "uboot";
|
firmware = "uboot";
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
configurations {
|
configurations {
|
||||||
default = "@config-DEFAULT-SEQ";
|
default = "@config-DEFAULT-SEQ";
|
||||||
|
|
||||||
binman_configuration: @config-SEQ {
|
@config-SEQ {
|
||||||
description = "NAME";
|
description = "NAME";
|
||||||
fdt = "fdt-SEQ";
|
fdt = "fdt-SEQ";
|
||||||
firmware = "uboot";
|
firmware = "uboot";
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
os = "arm-trusted-firmware";
|
os = "arm-trusted-firmware";
|
||||||
load = <CONFIG_K3_ATF_LOAD_ADDR>;
|
load = <CONFIG_K3_ATF_LOAD_ADDR>;
|
||||||
entry = <CONFIG_K3_ATF_LOAD_ADDR>;
|
entry = <CONFIG_K3_ATF_LOAD_ADDR>;
|
||||||
atf: atf-bl31 {
|
atf-bl31 {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
os = "tee";
|
os = "tee";
|
||||||
load = <0x9e800000>;
|
load = <0x9e800000>;
|
||||||
entry = <0x9e800000>;
|
entry = <0x9e800000>;
|
||||||
tee: tee-os {
|
tee-os {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
compression = "none";
|
compression = "none";
|
||||||
load = <CONFIG_SPL_TEXT_BASE>;
|
load = <CONFIG_SPL_TEXT_BASE>;
|
||||||
entry = <CONFIG_SPL_TEXT_BASE>;
|
entry = <CONFIG_SPL_TEXT_BASE>;
|
||||||
u_boot_spl_nodtb: blob-ext {
|
blob-ext {
|
||||||
filename = "spl/u-boot-spl-nodtb.bin";
|
filename = "spl/u-boot-spl-nodtb.bin";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
type = "flat_dt";
|
type = "flat_dt";
|
||||||
arch = "arm";
|
arch = "arm";
|
||||||
compression = "none";
|
compression = "none";
|
||||||
spl_am65x_evm_dtb: blob-ext {
|
blob-ext {
|
||||||
filename = "spl/dts/k3-am65-iot2050-spl.dtb";
|
filename = "spl/dts/k3-am65-iot2050-spl.dtb";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue