doc: fix incorrect usage of DT node unit address

The DT spec demands a unit-address in 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 various documentation 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:09 +00:00 committed by Simon Glass
parent b8790ebeec
commit 971a54193c
4 changed files with 42 additions and 42 deletions

View File

@ -86,7 +86,7 @@ Example:
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
description = "ARM64 Linux kernel"; description = "ARM64 Linux kernel";
data = /incbin/("./arch/arm64/boot/Image.gz"); data = /incbin/("./arch/arm64/boot/Image.gz");
type = "kernel"; type = "kernel";
@ -96,7 +96,7 @@ Example:
load = <0x80080000>; load = <0x80080000>;
entry = <0x80080000>; entry = <0x80080000>;
}; };
fdt@1 { fdt-1 {
description = "Flattened Device Tree blob"; description = "Flattened Device Tree blob";
data = /incbin/("./fsl-ls1043ardb-static.dtb"); data = /incbin/("./fsl-ls1043ardb-static.dtb");
type = "flat_dt"; type = "flat_dt";
@ -104,7 +104,7 @@ Example:
compression = "none"; compression = "none";
load = <0x90000000>; load = <0x90000000>;
}; };
ramdisk@1 { ramdisk {
description = "LS1043 Ramdisk"; description = "LS1043 Ramdisk";
data = /incbin/("./rootfs.cpio.gz"); data = /incbin/("./rootfs.cpio.gz");
type = "ramdisk"; type = "ramdisk";
@ -116,12 +116,12 @@ Example:
}; };
configurations { configurations {
default = "config@1"; default = "config-1";
config@1 { config-1 {
description = "Boot Linux kernel"; description = "Boot Linux kernel";
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
ramdisk = "ramdisk@1"; ramdisk = "ramdisk";
loadables = "fdt", "ramdisk"; loadables = "fdt", "ramdisk";
}; };
}; };

View File

@ -142,7 +142,7 @@ The following is an example for a simple usecase:
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@0 { kernel {
description = "linux"; description = "linux";
data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/Image.gz"); data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/Image.gz");
type = "kernel"; type = "kernel";
@ -151,44 +151,44 @@ The following is an example for a simple usecase:
compression = "gzip"; compression = "gzip";
load = <0x82080000>; load = <0x82080000>;
entry = <0x82080000>; entry = <0x82080000>;
hash@0 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
fdt@0 { fdt-1 {
description = "fdt"; description = "fdt";
data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dtb"); data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "arm64"; arch = "arm64";
compression = "none"; compression = "none";
hash@0 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
ramdisk@0 { ramdisk {
description = "ramdisk"; description = "ramdisk";
data = /incbin/("PATH/TO/YOUR/ROOTFS/DIR/rootfs.cpio"); data = /incbin/("PATH/TO/YOUR/ROOTFS/DIR/rootfs.cpio");
type = "ramdisk"; type = "ramdisk";
arch = "arm64"; arch = "arm64";
os = "linux"; os = "linux";
compression = "none"; compression = "none";
hash@0 { hash-1 {
algo = "sha256"; algo = "sha256";
}; };
}; };
}; };
configurations { configurations {
default = "config@0"; default = "config-1";
config@0 { config-1 {
description = "Configuration0"; description = "Configuration0";
kernel = "kernel@0"; kernel = "kernel";
fdt = "fdt@0"; fdt = "fdt-1";
ramdisk = "ramdisk@0"; ramdisk = "ramdisk";
signature@0 { signature-1 {
algo = "sha256,rsa2048"; algo = "sha256,rsa2048";
key-name-hint = "dev"; key-name-hint = "dev";
sign-images = "kernel", "fdt", "ramdisk"; sign-images = "kernel", "fdt", "ramdisk";
@ -268,9 +268,9 @@ If it is successful, you will see messages like follows:
---------------------------------------->8---------------------------------------- ---------------------------------------->8----------------------------------------
## Loading kernel from FIT Image at 84100000 ... ## Loading kernel from FIT Image at 84100000 ...
Using 'config@0' configuration Using 'config-1' configuration
Verifying Hash Integrity ... sha256,rsa2048:dev+ OK Verifying Hash Integrity ... sha256,rsa2048:dev+ OK
Trying 'kernel@0' kernel subimage Trying 'kernel' kernel subimage
Description: linux Description: linux
Created: 2017-10-20 14:32:29 UTC Created: 2017-10-20 14:32:29 UTC
Type: Kernel Image Type: Kernel Image
@ -285,8 +285,8 @@ If it is successful, you will see messages like follows:
Hash value: 82a37b7f11ae55f4e07aa25bf77e4067cb9dc1014d52d6cd4d588f92eee3aaad Hash value: 82a37b7f11ae55f4e07aa25bf77e4067cb9dc1014d52d6cd4d588f92eee3aaad
Verifying Hash Integrity ... sha256+ OK Verifying Hash Integrity ... sha256+ OK
## Loading ramdisk from FIT Image at 84100000 ... ## Loading ramdisk from FIT Image at 84100000 ...
Using 'config@0' configuration Using 'config-1' configuration
Trying 'ramdisk@0' ramdisk subimage Trying 'ramdisk' ramdisk subimage
Description: ramdisk Description: ramdisk
Created: 2017-10-20 14:32:29 UTC Created: 2017-10-20 14:32:29 UTC
Type: RAMDisk Image Type: RAMDisk Image
@ -301,8 +301,8 @@ If it is successful, you will see messages like follows:
Hash value: 44980a2874154a2e31ed59222c9f8ea968867637f35c81e4107a984de7014deb Hash value: 44980a2874154a2e31ed59222c9f8ea968867637f35c81e4107a984de7014deb
Verifying Hash Integrity ... sha256+ OK Verifying Hash Integrity ... sha256+ OK
## Loading fdt from FIT Image at 84100000 ... ## Loading fdt from FIT Image at 84100000 ...
Using 'config@0' configuration Using 'config-1' configuration
Trying 'fdt@0' fdt subimage Trying 'fdt-1' fdt subimage
Description: fdt Description: fdt
Created: 2017-10-20 14:32:29 UTC Created: 2017-10-20 14:32:29 UTC
Type: Flat Device Tree Type: Flat Device Tree

View File

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
description = "U-Boot mainline"; description = "U-Boot mainline";
type = "kernel_noload"; type = "kernel_noload";
arch = "arm"; arch = "arm";
@ -14,29 +14,29 @@
compression = "none"; compression = "none";
load = <0>; load = <0>;
entry = <0>; entry = <0>;
hash@2 { hash-2 {
algo = "sha1"; algo = "sha1";
}; };
}; };
fdt@1{ fdt-1{
description = "rk3288-veryron-jerry.dtb"; description = "rk3288-veryron-jerry.dtb";
data = /incbin/("../../b/chromebook_jerry/u-boot.dtb"); data = /incbin/("../../b/chromebook_jerry/u-boot.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "arm"; arch = "arm";
compression = "none"; compression = "none";
hash@1{ hash-1{
algo = "sha1"; algo = "sha1";
}; };
}; };
}; };
configurations { configurations {
default = "config@1"; default = "config-1";
config@1 { config-1 {
description = "Boot U-Boot"; description = "Boot U-Boot";
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
}; };
}; };
}; };

View File

@ -5,7 +5,7 @@
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel {
description = "U-Boot mainline"; description = "U-Boot mainline";
type = "kernel_noload"; type = "kernel_noload";
arch = "arm"; arch = "arm";
@ -14,29 +14,29 @@
compression = "none"; compression = "none";
load = <0>; load = <0>;
entry = <0>; entry = <0>;
hash@2 { hash-2 {
algo = "sha1"; algo = "sha1";
}; };
}; };
fdt@1{ fdt-1{
description = "tegra124-nyan-big.dtb"; description = "tegra124-nyan-big.dtb";
data = /incbin/("../.././b/nyan-big/u-boot.dtb"); data = /incbin/("../.././b/nyan-big/u-boot.dtb");
type = "flat_dt"; type = "flat_dt";
arch = "arm"; arch = "arm";
compression = "none"; compression = "none";
hash@1{ hash-1{
algo = "sha1"; algo = "sha1";
}; };
}; };
}; };
configurations { configurations {
default = "config@1"; default = "config-1";
config@1 { config-1 {
description = "Boot U-Boot"; description = "Boot U-Boot";
kernel = "kernel@1"; kernel = "kernel";
fdt = "fdt@1"; fdt = "fdt-1";
}; };
}; };
}; };