[U-Boot] [PATCH v3 65/66] rockchip: board: puma-rk3399: fix warnings in puma_rk3399/fit_spl_atf.its

[Kever Yang]

Hi Philipp,

     rk3399 atf has 3 parts, sram.data, sram.text, pmu_fw for m0, and 
now the ATF project output

with all 3 section in one bl31.elf, I use to abstract them into 3 
separate bin file and package them

with fit.

     Could you share some more detail about how you use the ATF in 
puma-rk3399? You only have

two section in its description. How many steps do you need for rk3399 to 
get uboot, atf and the image

can be flash to eMMC?

Thanks,
- Kever
On 07/29/2017 03:22 AM, Philipp Tomsich wrote:
> The ITS file generated warnings due to @<num> designations in the naming
> which cause DTC to complain as follows:
>    Warning (unit_address_vs_reg): Node /images/uboot at 1 has a unit name, but no reg property
>    Warning (unit_address_vs_reg): Node /images/atf at 1 has a unit name, but no reg property
>    Warning (unit_address_vs_reg): Node /images/pmu at 1 has a unit name, but no reg property
>    Warning (unit_address_vs_reg): Node /images/fdt at 1 has a unit name, but no reg property
>    Warning (unit_address_vs_reg): Node /configurations/conf at 1 has a unit name, but no reg property
>
> This removes the @<num> part from the names, as we only have a single
> image for each payload aspect (and only a single configuration) anyway.
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
>
> Reviewed-by: Simon Glass <sjg at chromium.org>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
>   board/theobroma-systems/puma_rk3399/fit_spl_atf.its | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
> index f93c251..0519fad 100644
> --- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
> +++ b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
> @@ -13,7 +13,7 @@
>   	#address-cells = <1>;
>   
>   	images {
> -		uboot at 1 {
> +		uboot {
>   			description = "U-Boot (64-bit)";
>   			data = /incbin/("../../../u-boot-nodtb.bin");
>   			type = "standalone";
> @@ -21,7 +21,7 @@
>   			compression = "none";
>   			load = <0x00200000>;
>   		};
> -		atf at 1 {
> +		atf {
>   			description = "ARM Trusted Firmware";
>   			data = /incbin/("../../../bl31.bin");
>   			type = "firmware";
> @@ -30,14 +30,14 @@
>   			load = <0x00001000>;
>   			entry = <0x00001000>;
>   		};
> -		pmu at 1 {
> +		pmu {
>   		        description = "Cortex-M0 firmware";
>   			data = /incbin/("../../../rk3399m0.bin");
>   			type = "pmu-firmware";
>   			compression = "none";
>   			load = <0xff8c0000>;
>                   };
> -		fdt at 1 {
> +		fdt {
>   			description = "RK3399-Q7 (Puma) flat device-tree";
>   			data = /incbin/("../../../u-boot.dtb");
>   			type = "flat_dt";
> @@ -46,12 +46,12 @@
>   	};
>   
>   	configurations {
> -		default = "conf at 1";
> -		conf at 1 {
> +		default = "conf";
> +		conf {
>   			description = "Theobroma Systems RK3399-Q7 (Puma) SoM";
> -			firmware = "uboot at 1";
> -			loadables = "atf at 1";
> -			fdt = "fdt at 1";
> +			firmware = "uboot";
> +			loadables = "atf";
> +			fdt = "fdt";
>   		};
>   	};
>   };