From: Andre Przywara Date: Mon, 4 Dec 2017 02:05:09 +0000 (+0000) Subject: doc: fix incorrect usage of DT node unit address X-Git-Tag: v2018.03-rc1~174^2~6 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=971a54193c9a90a6651064c4a7879e3568e9e7b8;p=oweals%2Fu-boot.git 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 --- diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon index 2505f408ab..a00b5bc9c3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon @@ -86,7 +86,7 @@ Example: #address-cells = <1>; images { - kernel@1 { + kernel { description = "ARM64 Linux kernel"; data = /incbin/("./arch/arm64/boot/Image.gz"); type = "kernel"; @@ -96,7 +96,7 @@ Example: load = <0x80080000>; entry = <0x80080000>; }; - fdt@1 { + fdt-1 { description = "Flattened Device Tree blob"; data = /incbin/("./fsl-ls1043ardb-static.dtb"); type = "flat_dt"; @@ -104,7 +104,7 @@ Example: compression = "none"; load = <0x90000000>; }; - ramdisk@1 { + ramdisk { description = "LS1043 Ramdisk"; data = /incbin/("./rootfs.cpio.gz"); type = "ramdisk"; @@ -116,12 +116,12 @@ Example: }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot Linux kernel"; - kernel = "kernel@1"; - fdt = "fdt@1"; - ramdisk = "ramdisk@1"; + kernel = "kernel"; + fdt = "fdt-1"; + ramdisk = "ramdisk"; loadables = "fdt", "ramdisk"; }; }; diff --git a/doc/README.uniphier b/doc/README.uniphier index 0fa3248fae..990806ab79 100644 --- a/doc/README.uniphier +++ b/doc/README.uniphier @@ -142,7 +142,7 @@ The following is an example for a simple usecase: #address-cells = <1>; images { - kernel@0 { + kernel { description = "linux"; data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/Image.gz"); type = "kernel"; @@ -151,44 +151,44 @@ The following is an example for a simple usecase: compression = "gzip"; load = <0x82080000>; entry = <0x82080000>; - hash@0 { + hash-1 { algo = "sha256"; }; }; - fdt@0 { + fdt-1 { description = "fdt"; data = /incbin/("PATH/TO/YOUR/LINUX/DIR/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; - hash@0 { + hash-1 { algo = "sha256"; }; }; - ramdisk@0 { + ramdisk { description = "ramdisk"; data = /incbin/("PATH/TO/YOUR/ROOTFS/DIR/rootfs.cpio"); type = "ramdisk"; arch = "arm64"; os = "linux"; compression = "none"; - hash@0 { + hash-1 { algo = "sha256"; }; }; }; configurations { - default = "config@0"; + default = "config-1"; - config@0 { + config-1 { description = "Configuration0"; - kernel = "kernel@0"; - fdt = "fdt@0"; - ramdisk = "ramdisk@0"; - signature@0 { + kernel = "kernel"; + fdt = "fdt-1"; + ramdisk = "ramdisk"; + signature-1 { algo = "sha256,rsa2048"; key-name-hint = "dev"; sign-images = "kernel", "fdt", "ramdisk"; @@ -268,9 +268,9 @@ If it is successful, you will see messages like follows: ---------------------------------------->8---------------------------------------- ## Loading kernel from FIT Image at 84100000 ... - Using 'config@0' configuration + Using 'config-1' configuration Verifying Hash Integrity ... sha256,rsa2048:dev+ OK - Trying 'kernel@0' kernel subimage + Trying 'kernel' kernel subimage Description: linux Created: 2017-10-20 14:32:29 UTC Type: Kernel Image @@ -285,8 +285,8 @@ If it is successful, you will see messages like follows: Hash value: 82a37b7f11ae55f4e07aa25bf77e4067cb9dc1014d52d6cd4d588f92eee3aaad Verifying Hash Integrity ... sha256+ OK ## Loading ramdisk from FIT Image at 84100000 ... - Using 'config@0' configuration - Trying 'ramdisk@0' ramdisk subimage + Using 'config-1' configuration + Trying 'ramdisk' ramdisk subimage Description: ramdisk Created: 2017-10-20 14:32:29 UTC Type: RAMDisk Image @@ -301,8 +301,8 @@ If it is successful, you will see messages like follows: Hash value: 44980a2874154a2e31ed59222c9f8ea968867637f35c81e4107a984de7014deb Verifying Hash Integrity ... sha256+ OK ## Loading fdt from FIT Image at 84100000 ... - Using 'config@0' configuration - Trying 'fdt@0' fdt subimage + Using 'config-1' configuration + Trying 'fdt-1' fdt subimage Description: fdt Created: 2017-10-20 14:32:29 UTC Type: Flat Device Tree diff --git a/doc/chromium/chromebook_jerry.its b/doc/chromium/chromebook_jerry.its index 8cff840e00..7505a20535 100644 --- a/doc/chromium/chromebook_jerry.its +++ b/doc/chromium/chromebook_jerry.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { description = "U-Boot mainline"; type = "kernel_noload"; arch = "arm"; @@ -14,29 +14,29 @@ compression = "none"; load = <0>; entry = <0>; - hash@2 { + hash-2 { algo = "sha1"; }; }; - fdt@1{ + fdt-1{ description = "rk3288-veryron-jerry.dtb"; data = /incbin/("../../b/chromebook_jerry/u-boot.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; - hash@1{ + hash-1{ algo = "sha1"; }; }; }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot U-Boot"; - kernel = "kernel@1"; - fdt = "fdt@1"; + kernel = "kernel"; + fdt = "fdt-1"; }; }; }; diff --git a/doc/chromium/nyan-big.its b/doc/chromium/nyan-big.its index 8dc8d73041..37d4e10949 100644 --- a/doc/chromium/nyan-big.its +++ b/doc/chromium/nyan-big.its @@ -5,7 +5,7 @@ #address-cells = <1>; images { - kernel@1 { + kernel { description = "U-Boot mainline"; type = "kernel_noload"; arch = "arm"; @@ -14,29 +14,29 @@ compression = "none"; load = <0>; entry = <0>; - hash@2 { + hash-2 { algo = "sha1"; }; }; - fdt@1{ + fdt-1{ description = "tegra124-nyan-big.dtb"; data = /incbin/("../.././b/nyan-big/u-boot.dtb"); type = "flat_dt"; arch = "arm"; compression = "none"; - hash@1{ + hash-1{ algo = "sha1"; }; }; }; configurations { - default = "config@1"; - config@1 { + default = "config-1"; + config-1 { description = "Boot U-Boot"; - kernel = "kernel@1"; - fdt = "fdt@1"; + kernel = "kernel"; + fdt = "fdt-1"; }; }; };