doc: FIT image: fix incorrect examples of DT node unit address

The DT spec demands a unit-address of a node name to match the "reg"
property in that node. Newer dtc versions will throw warnings if this is
not the case.
Fix all occurences in the FIT image example files where this was not
observed, to not give bad examples to the reader.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara 2017-12-04 02:05:08 +00:00 committed by Simon Glass
parent 838404054e
commit b8790ebeec
10 changed files with 117 additions and 117 deletions

View file

@ -9,7 +9,7 @@
#address-cells = <1>;
images {
kernel@1 {
kernel {
description = "Vanilla Linux kernel";
data = /incbin/("./vmlinux.bin.gz");
type = "kernel";
@ -18,20 +18,20 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "crc32";
};
hash@2 {
hash-2 {
algo = "sha1";
};
};
};
configurations {
default = "config@1";
config@1 {
default = "config-1";
config-1 {
description = "Boot Linux kernel";
kernel = "kernel@1";
kernel = "kernel";
};
};
};
@ -47,7 +47,7 @@ For x86 a setup node is also required: see x86-fit-boot.txt.
#address-cells = <1>;
images {
kernel@1 {
kernel {
description = "Vanilla Linux kernel";
data = /incbin/("./image.bin.lzo");
type = "kernel";
@ -56,12 +56,12 @@ For x86 a setup node is also required: see x86-fit-boot.txt.
compression = "lzo";
load = <0x01000000>;
entry = <0x00000000>;
hash@2 {
hash-2 {
algo = "sha1";
};
};
setup@1 {
setup {
description = "Linux setup.bin";
data = /incbin/("./setup.bin");
type = "x86_setup";
@ -70,18 +70,18 @@ For x86 a setup node is also required: see x86-fit-boot.txt.
compression = "none";
load = <0x00090000>;
entry = <0x00090000>;
hash@2 {
hash-2 {
algo = "sha1";
};
};
};
configurations {
default = "config@1";
config@1 {
default = "config-1";
config-1 {
description = "Boot Linux kernel";
kernel = "kernel@1";
setup = "setup@1";
kernel = "kernel";
setup = "setup";
};
};
};

View file

@ -9,7 +9,7 @@
#address-cells = <1>;
images {
kernel@1 {
kernel {
description = "Vanilla Linux kernel";
data = /incbin/("./vmlinux.bin.gz");
type = "kernel";
@ -18,34 +18,34 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "crc32";
};
hash@2 {
hash-2 {
algo = "sha1";
};
};
fdt@1 {
fdt-1 {
description = "Flattened Device Tree blob";
data = /incbin/("./target.dtb");
type = "flat_dt";
arch = "ppc";
compression = "none";
hash@1 {
hash-1 {
algo = "crc32";
};
hash@2 {
hash-2 {
algo = "sha1";
};
};
};
configurations {
default = "conf@1";
conf@1 {
default = "conf-1";
conf-1 {
description = "Boot Linux kernel with FDT blob";
kernel = "kernel@1";
fdt = "fdt@1";
kernel = "kernel";
fdt = "fdt-1";
};
};
};

View file

@ -10,31 +10,31 @@
#address-cells = <1>;
images {
fdt@1 {
fdt-1 {
description = "zc706";
data = /incbin/("/tftpboot/devicetree.dtb");
type = "flat_dt";
arch = "arm";
compression = "none";
load = <0x10000000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
fpga@1 {
fpga {
description = "FPGA";
data = /incbin/("/tftpboot/download.bit");
type = "fpga";
arch = "arm";
compression = "none";
load = <0x30000000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
linux_kernel@1 {
linux_kernel {
description = "Linux";
data = /incbin/("/tftpboot/zImage");
type = "kernel";
@ -43,25 +43,25 @@
compression = "none";
load = <0x8000>;
entry = <0x8000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
};
configurations {
default = "config@2";
config@1 {
default = "config-2";
config-1 {
description = "Linux";
kernel = "linux_kernel@1";
fdt = "fdt@1";
kernel = "linux_kernel";
fdt = "fdt-1";
};
config@2 {
config-2 {
description = "Linux with fpga";
kernel = "linux_kernel@1";
fdt = "fdt@1";
fpga = "fpga@1";
kernel = "linux_kernel";
fdt = "fdt-1";
fpga = "fpga";
};
};
};

View file

@ -10,7 +10,7 @@
#address-cells = <1>;
images {
xen_kernel@1 {
xen_kernel {
description = "xen binary";
data = /incbin/("./xen");
type = "kernel";
@ -19,36 +19,36 @@
compression = "none";
load = <0xa0000000>;
entry = <0xa0000000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
fdt@1 {
fdt-1 {
description = "xexpress-ca15 tree blob";
data = /incbin/("./vexpress-v2p-ca15-tc1.dtb");
type = "flat_dt";
arch = "arm";
compression = "none";
load = <0xb0000000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
fdt@2 {
fdt-2 {
description = "xexpress-ca15 tree blob";
data = /incbin/("./vexpress-v2p-ca15-tc1.dtb");
type = "flat_dt";
arch = "arm";
compression = "none";
load = <0xb0400000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
linux_kernel@1 {
linux_kernel {
description = "Linux Image";
data = /incbin/("./Image");
type = "kernel";
@ -57,33 +57,33 @@
compression = "none";
load = <0xa0000000>;
entry = <0xa0000000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
};
configurations {
default = "config@2";
default = "config-2";
config@1 {
config-1 {
description = "Just plain Linux";
kernel = "linux_kernel@1";
fdt = "fdt@1";
kernel = "linux_kernel";
fdt = "fdt-1";
};
config@2 {
config-2 {
description = "Xen one loadable";
kernel = "xen_kernel@1";
fdt = "fdt@1";
loadables = "linux_kernel@1";
kernel = "xen_kernel";
fdt = "fdt-1";
loadables = "linux_kernel";
};
config@3 {
config-3 {
description = "Xen two loadables";
kernel = "xen_kernel@1";
fdt = "fdt@1";
loadables = "linux_kernel@1", "fdt@2";
kernel = "xen_kernel";
fdt = "fdt-1";
loadables = "linux_kernel", "fdt-2";
};
};
};

View file

@ -9,7 +9,7 @@
#address-cells = <1>;
images {
kernel@1 {
kernel-1 {
description = "vanilla-2.6.23";
data = /incbin/("./vmlinux.bin.gz");
type = "kernel";
@ -18,15 +18,15 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "md5";
};
hash@2 {
hash-2 {
algo = "sha1";
};
};
kernel@2 {
kernel-2 {
description = "2.6.23-denx";
data = /incbin/("./2.6.23-denx.bin.gz");
type = "kernel";
@ -35,12 +35,12 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
kernel@3 {
kernel-3 {
description = "2.4.25-denx";
data = /incbin/("./2.4.25-denx.bin.gz");
type = "kernel";
@ -49,12 +49,12 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "md5";
};
};
ramdisk@1 {
ramdisk-1 {
description = "eldk-4.2-ramdisk";
data = /incbin/("./eldk-4.2-ramdisk");
type = "ramdisk";
@ -63,12 +63,12 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
ramdisk@2 {
ramdisk-2 {
description = "eldk-3.1-ramdisk";
data = /incbin/("./eldk-3.1-ramdisk");
type = "ramdisk";
@ -77,30 +77,30 @@
compression = "gzip";
load = <00000000>;
entry = <00000000>;
hash@1 {
hash-1 {
algo = "crc32";
};
};
fdt@1 {
fdt-1 {
description = "tqm5200-fdt";
data = /incbin/("./tqm5200.dtb");
type = "flat_dt";
arch = "ppc";
compression = "none";
hash@1 {
hash-1 {
algo = "crc32";
};
};
fdt@2 {
fdt-2 {
description = "tqm5200s-fdt";
data = /incbin/("./tqm5200s.dtb");
type = "flat_dt";
arch = "ppc";
compression = "none";
load = <00700000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
@ -108,26 +108,26 @@
};
configurations {
default = "config@1";
default = "config-1";
config@1 {
config-1 {
description = "tqm5200 vanilla-2.6.23 configuration";
kernel = "kernel@1";
ramdisk = "ramdisk@1";
fdt = "fdt@1";
kernel = "kernel-1";
ramdisk = "ramdisk-1";
fdt = "fdt-1";
};
config@2 {
config-2 {
description = "tqm5200s denx-2.6.23 configuration";
kernel = "kernel@2";
ramdisk = "ramdisk@1";
fdt = "fdt@2";
kernel = "kernel-2";
ramdisk = "ramdisk-1";
fdt = "fdt-2";
};
config@3 {
config-3 {
description = "tqm5200s denx-2.4.25 configuration";
kernel = "kernel@3";
ramdisk = "ramdisk@2";
kernel = "kernel-3";
ramdisk = "ramdisk-2";
};
};
};

View file

@ -45,7 +45,7 @@
load = <0x40000>;
};
fdt@1 {
fdt-1 {
description = "Pine64+ DT";
type = "flat_dt";
compression = "none";
@ -53,7 +53,7 @@
arch = "arm64";
};
fdt@2 {
fdt-2 {
description = "Pine64 DT";
type = "flat_dt";
compression = "none";
@ -79,18 +79,18 @@
};
configurations {
default = "config@1";
default = "config-1";
config@1 {
config-1 {
description = "sun50i-a64-pine64-plus";
loadables = "uboot", "atf", "kernel", "initrd";
fdt = "fdt@1";
fdt = "fdt-1";
};
config@2 {
config-2 {
description = "sun50i-a64-pine64";
loadables = "uboot", "atf", "mgmt-firmware";
fdt = "fdt@2";
fdt = "fdt-2";
};
};
};

View file

@ -5,7 +5,7 @@
#address-cells = <1>;
images {
kernel@1 {
kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@ -14,28 +14,28 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
fdt@1 {
fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
};
configurations {
default = "conf@1";
conf@1 {
kernel = "kernel@1";
fdt = "fdt@1";
signature@1 {
default = "conf-1";
conf-1 {
kernel = "kernel";
fdt = "fdt-1";
signature {
algo = "sha1,rsa2048";
key-name-hint = "dev";
sign-images = "fdt", "kernel";

View file

@ -5,7 +5,7 @@
#address-cells = <1>;
images {
kernel@1 {
kernel {
data = /incbin/("test-kernel.bin");
type = "kernel_noload";
arch = "sandbox";
@ -14,29 +14,29 @@
load = <0x4>;
entry = <0x8>;
kernel-version = <1>;
signature@1 {
signature {
algo = "sha1,rsa2048";
key-name-hint = "dev";
};
};
fdt@1 {
fdt-1 {
description = "snow";
data = /incbin/("sandbox-kernel.dtb");
type = "flat_dt";
arch = "sandbox";
compression = "none";
fdt-version = <1>;
signature@1 {
signature {
algo = "sha1,rsa2048";
key-name-hint = "dev";
};
};
};
configurations {
default = "conf@1";
conf@1 {
kernel = "kernel@1";
fdt = "fdt@1";
default = "conf-1";
conf-1 {
kernel = "kernel";
fdt = "fdt-1";
};
};
};

View file

@ -9,34 +9,34 @@
#address-cells = <1>;
images {
update@1 {
update-1 {
description = "Linux kernel binary";
data = /incbin/("./vmlinux.bin.gz");
compression = "none";
type = "firmware";
load = <FF700000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
update@2 {
update-2 {
description = "Ramdisk image";
data = /incbin/("./ramdisk_image.gz");
compression = "none";
type = "firmware";
load = <FF8E0000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};
update@3 {
update-3 {
description = "FDT blob";
data = /incbin/("./blob.fdt");
compression = "none";
type = "firmware";
load = <FFAC0000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};

View file

@ -10,13 +10,13 @@
#address-cells = <1>;
images {
update@1 {
update-1 {
description = "U-Boot binary";
data = /incbin/("./u-boot.bin");
compression = "none";
type = "firmware";
load = <FFFC0000>;
hash@1 {
hash-1 {
algo = "sha1";
};
};