| Message ID | 758d520f03525ddb02d565e4dbea0ede61f516b2.1629701020.git.michal.simek@xilinx.com |
|---|---|
| State | Accepted |
| Commit | 060fa0e11bde87a22898b2c152b701e25dcfe0db |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | xilinx: zynqmp: Update descriptions for u-boot.its | expand |
po 23. 8. 2021 v 8:43 odesÃlatel Michal Simek <michal.simek@xilinx.com> napsal: > > Use TF-A instead of ATF in description. And update generic description with > removing ATF because also configurations without it are supported. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh > index feb3a6260a34..72a8a3eb7714 100755 > --- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh > +++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh > @@ -57,7 +57,7 @@ cat << __HEADER_EOF > /dts-v1/; > > / { > - description = "Configuration to load ATF before U-Boot"; > + description = "Configuration for Xilinx ZynqMP SoC"; > > images { > uboot { > @@ -78,7 +78,7 @@ __HEADER_EOF > if [ -f $BL31 ]; then > cat << __ATF > atf { > - description = "ARM Trusted Firmware"; > + description = "Trusted Firmware-A"; > data = /incbin/("$BL31"); > type = "firmware"; > os = "arm-trusted-firmware"; > -- > 2.33.0 > Applied. M
diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh index feb3a6260a34..72a8a3eb7714 100755 --- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh +++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh @@ -57,7 +57,7 @@ cat << __HEADER_EOF /dts-v1/; / { - description = "Configuration to load ATF before U-Boot"; + description = "Configuration for Xilinx ZynqMP SoC"; images { uboot { @@ -78,7 +78,7 @@ __HEADER_EOF if [ -f $BL31 ]; then cat << __ATF atf { - description = "ARM Trusted Firmware"; + description = "Trusted Firmware-A"; data = /incbin/("$BL31"); type = "firmware"; os = "arm-trusted-firmware";
Use TF-A instead of ATF in description. And update generic description with removing ATF because also configurations without it are supported. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)