Re: [PATCH v4 05/10] rockchip: binman: Un-indent the FIT template

[Kever Yang <kever.yang@rock-chips.com>]

On 2025/3/29 23:06, Jonas Karlman wrote:
> From: Simon Glass <sjg@chromium.org>
>
> Fix the indentation on the template. This is done in a separate patch
> so that it is easier to review.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
> Changes in v4:
> - Split from "VBE serial part H: Implement VBE on Rockchip RK3399"
> ---
>   arch/arm/dts/rockchip-u-boot.dtsi | 176 +++++++++++++++---------------
>   1 file changed, 88 insertions(+), 88 deletions(-)
>
> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
> index 9ef1ca6cd13a..f860bfc1ba72 100644
> --- a/arch/arm/dts/rockchip-u-boot.dtsi
> +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> @@ -33,120 +33,120 @@
>   &binman {
>   #ifdef HAS_FIT
>   	fit_template: template-1 {
> -			type = "fit";
> +		type = "fit";
>   #ifdef CONFIG_ARM64
> -			description = "FIT image for U-Boot with bl31 (TF-A)";
> +		description = "FIT image for U-Boot with bl31 (TF-A)";
>   #else
> -			description = "FIT image with OP-TEE";
> +		description = "FIT image with OP-TEE";
>   #endif
> -			#address-cells = <1>;
> -			fit,fdt-list = "of-list";
> -			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
> -			fit,align = <512>;
> -			images {
> -				u-boot {
> -					description = "U-Boot";
> -					type = "standalone";
> -					os = "u-boot";
> -					arch = ARCH;
> -					compression = COMP;
> -					load = <CONFIG_TEXT_BASE>;
> -					entry = <CONFIG_TEXT_BASE>;
> -					u-boot-nodtb {
> +		#address-cells = <1>;
> +		fit,fdt-list = "of-list";
> +		fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
> +		fit,align = <512>;
> +		images {
> +			u-boot {
> +				description = "U-Boot";
> +				type = "standalone";
> +				os = "u-boot";
> +				arch = ARCH;
> +				compression = COMP;
> +				load = <CONFIG_TEXT_BASE>;
> +				entry = <CONFIG_TEXT_BASE>;
> +				u-boot-nodtb {
>   					compress = COMP;
> -					};
> +				};
>   #ifdef CONFIG_SPL_FIT_SIGNATURE
> -					hash {
> -						algo = "sha256";
> -					};
> -#endif
> +				hash {
> +					algo = "sha256";
>   				};
> +#endif
> +			};
>   
>   #ifdef CONFIG_ARM64
> -				@atf-SEQ {
> -					fit,operation = "split-elf";
> -					description = "ARM Trusted Firmware";
> -					type = "firmware";
> -					arch = ARCH;
> -					os = "arm-trusted-firmware";
> -					compression = "none";
> -					fit,load;
> -					fit,entry;
> -					fit,data;
> -
> -					atf-bl31 {
> -					};
> +			@atf-SEQ {
> +				fit,operation = "split-elf";
> +				description = "ARM Trusted Firmware";
> +				type = "firmware";
> +				arch = ARCH;
> +				os = "arm-trusted-firmware";
> +				compression = "none";
> +				fit,load;
> +				fit,entry;
> +				fit,data;
> +
> +				atf-bl31 {
> +				};
>   #ifdef CONFIG_SPL_FIT_SIGNATURE
> -					hash {
> -						algo = "sha256";
> -					};
> +				hash {
> +					algo = "sha256";
> +				};
>   #endif
> +			};
> +			@tee-SEQ {
> +				fit,operation = "split-elf";
> +				description = "TEE";
> +				type = "tee";
> +				arch = ARCH;
> +				os = "tee";
> +				compression = "none";
> +				fit,load;
> +				fit,entry;
> +				fit,data;
> +
> +				tee-os {
> +					optional;
>   				};
> -				@tee-SEQ {
> -					fit,operation = "split-elf";
> -					description = "TEE";
> -					type = "tee";
> -					arch = ARCH;
> -					os = "tee";
> -					compression = "none";
> -					fit,load;
> -					fit,entry;
> -					fit,data;
> -
> -					tee-os {
> -						optional;
> -					};
>   #ifdef CONFIG_SPL_FIT_SIGNATURE
> -					hash {
> -						algo = "sha256";
> -					};
> -#endif
> +				hash {
> +					algo = "sha256";
>   				};
> +#endif
> +			};
>   #else /* !CONFIG_ARM64 */
> -				op-tee {
> -					description = "OP-TEE";
> -					type = "tee";
> -					arch = ARCH;
> -					os = "tee";
> -					compression = "none";
> -					load = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
> -					entry = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
> -
> -					tee-os {
> -					};
> +			op-tee {
> +				description = "OP-TEE";
> +				type = "tee";
> +				arch = ARCH;
> +				os = "tee";
> +				compression = "none";
> +				load = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
> +				entry = <(CFG_SYS_SDRAM_BASE + 0x8400000)>;
> +
> +				tee-os {
> +				};
>   #ifdef CONFIG_SPL_FIT_SIGNATURE
> -					hash {
> -						algo = "sha256";
> -					};
> -#endif
> +				hash {
> +					algo = "sha256";
>   				};
> +#endif
> +			};
>   #endif /* CONFIG_ARM64 */
>   
> -				@fdt-SEQ {
> -					description = "fdt-NAME";
> -					compression = "none";
> -					type = "flat_dt";
> +			@fdt-SEQ {
> +				description = "fdt-NAME";
> +				compression = "none";
> +				type = "flat_dt";
>   #ifdef CONFIG_SPL_FIT_SIGNATURE
> -					hash {
> -						algo = "sha256";
> -					};
> -#endif
> +				hash {
> +					algo = "sha256";
>   				};
> +#endif
>   			};
> +		};
>   
> -			configurations {
> -				default = "@config-DEFAULT-SEQ";
> -				@config-SEQ {
> -					description = "NAME.dtb";
> -					fdt = "fdt-SEQ";
> +		configurations {
> +			default = "@config-DEFAULT-SEQ";
> +			@config-SEQ {
> +				description = "NAME.dtb";
> +				fdt = "fdt-SEQ";
>   #ifdef CONFIG_ARM64
> -					fit,firmware = "atf-1", "u-boot";
> +				fit,firmware = "atf-1", "u-boot";
>   #else
> -					fit,firmware = "op-tee", "u-boot";
> +				fit,firmware = "op-tee", "u-boot";
>   #endif
> -					fit,loadables;
> -				};
> +				fit,loadables;
>   			};
> +		};
>   	};
>   #endif /* HAS_FIT */
>