| Message ID | 20210824075514.21153-1-andrey.zhizhikin@leica-geosystems.com |
|---|---|
| State | Accepted |
| Commit | d9a6f0eed66a39206b13513ec914f14084c3bb73 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [RFC] tree: imx: remove old fit generator script | expand |
On Tue, 24 Aug 2021 at 01:55, Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> wrote: > > Since derivatives are moving to binman from usage of the FIT generator > script, and considering the warning introduced in f4a43d2925 > ("Makefile: Warn against using CONFIG_SPL_FIT_GENERATOR"), usage of FIT > generator is discouraged. > > Current FIT generator also generates broken output, since commit > 3f04db891a ("image: Check for unit addresses in FITs") prohibits using > '@' for unit addresses but the generator script still emits the old > sematics. > > Remove the generator script and corresponding call in Makefile, all > derivatives should be migrated to binman in order to provide binary > images. > > Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> > --- > Makefile | 3 - > arch/arm/mach-imx/mkimage_fit_atf.sh | 143 --------------------------- > 2 files changed, 146 deletions(-) > delete mode 100755 arch/arm/mach-imx/mkimage_fit_atf.sh Reviewed-by: Simon Glass <sjg@chromium.org>
Hi Andrey, On Tue, Aug 24, 2021 at 4:55 AM Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> wrote: > > Since derivatives are moving to binman from usage of the FIT generator > script, and considering the warning introduced in f4a43d2925 > ("Makefile: Warn against using CONFIG_SPL_FIT_GENERATOR"), usage of FIT > generator is discouraged. > > Current FIT generator also generates broken output, since commit > 3f04db891a ("image: Check for unit addresses in FITs") prohibits using > '@' for unit addresses but the generator script still emits the old > sematics. > > Remove the generator script and corresponding call in Makefile, all > derivatives should be migrated to binman in order to provide binary > images. > > Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> Since derivatives are moving to binman from usage of the FIT generator > script, and considering the warning introduced in f4a43d2925 > ("Makefile: Warn against using CONFIG_SPL_FIT_GENERATOR"), usage of FIT > generator is discouraged. > Current FIT generator also generates broken output, since commit > 3f04db891a ("image: Check for unit addresses in FITs") prohibits using > '@' for unit addresses but the generator script still emits the old > sematics. > Remove the generator script and corresponding call in Makefile, all > derivatives should be migrated to binman in order to provide binary > images. > Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Fabio Estevam <festevam@gmail.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/Makefile b/Makefile index 3c8437d21a..6760ddc826 100644 --- a/Makefile +++ b/Makefile @@ -1350,9 +1350,6 @@ $(U_BOOT_ITS): $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) else ifneq ($(CONFIG_USE_SPL_FIT_GENERATOR),) U_BOOT_ITS := u-boot.its -ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-imx/mkimage_fit_atf.sh") -U_BOOT_ITS_DEPS += u-boot-nodtb.bin -endif ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py") U_BOOT_ITS_DEPS += u-boot endif diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh deleted file mode 100755 index 2a17968794..0000000000 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ -# -# script to generate FIT image source for i.MX8MQ boards with -# ARM Trusted Firmware and multiple device trees (given on the command line) -# -# usage: $0 <dt_name> [<dt_name> [<dt_name] ...] - -[ -z "$BL31" ] && BL31="bl31.bin" -[ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000" -[ -z "$ATF_LOAD_ADDR" ] && ATF_LOAD_ADDR="0x00910000" -[ -z "$BL33_LOAD_ADDR" ] && BL33_LOAD_ADDR="0x40200000" - -if [ ! -f $BL31 ]; then - echo "ERROR: BL31 file $BL31 NOT found" >&2 - exit 0 -else - echo "$BL31 size: " >&2 - stat -c %s $BL31 >&2 -fi - -BL32="tee.bin" - -if [ ! -f $BL32 ]; then - BL32=/dev/null -else - echo "Building with TEE support, make sure your $BL31 is compiled with spd. If you do not want tee, please delete $BL31" >&2 - echo "$BL32 size: " >&2 - stat -c %s $BL32 >&2 -fi - -BL33="u-boot-nodtb.bin" - -if [ ! -f $BL33 ]; then - echo "ERROR: $BL33 file NOT found" >&2 - exit 0 -else - echo "u-boot-nodtb.bin size: " >&2 - stat -c %s u-boot-nodtb.bin >&2 -fi - -for dtname in $* -do - echo "$dtname size: " >&2 - stat -c %s $dtname >&2 -done - - -cat << __HEADER_EOF -/dts-v1/; - -/ { - description = "Configuration to load ATF before U-Boot"; - - images { - uboot@1 { - description = "U-Boot (64-bit)"; - os = "u-boot"; - data = /incbin/("$BL33"); - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = <$BL33_LOAD_ADDR>; - }; -__HEADER_EOF - -cnt=1 -for dtname in $* -do - cat << __FDT_IMAGE_EOF - fdt@$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; - compression = "none"; - }; -__FDT_IMAGE_EOF -cnt=$((cnt+1)) -done - -cat << __HEADER_EOF - atf@1 { - description = "ARM Trusted Firmware"; - os = "arm-trusted-firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <$ATF_LOAD_ADDR>; - entry = <$ATF_LOAD_ADDR>; - }; -__HEADER_EOF - -if [ -f $BL32 ]; then -cat << __HEADER_EOF - tee@1 { - description = "TEE firmware"; - data = /incbin/("$BL32"); - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <$TEE_LOAD_ADDR>; - entry = <$TEE_LOAD_ADDR>; - }; -__HEADER_EOF -fi - -cat << __CONF_HEADER_EOF - }; - configurations { - default = "config@1"; - -__CONF_HEADER_EOF - -cnt=1 -for dtname in $* -do -if [ -f $BL32 ]; then -cat << __CONF_SECTION_EOF - config@$cnt { - description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1", "tee@1"; - fdt = "fdt@$cnt"; - }; -__CONF_SECTION_EOF -else -cat << __CONF_SECTION1_EOF - config@$cnt { - description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1"; - fdt = "fdt@$cnt"; - }; -__CONF_SECTION1_EOF -fi -cnt=$((cnt+1)) -done - -cat << __ITS_EOF - }; -}; -__ITS_EOF
Since derivatives are moving to binman from usage of the FIT generator script, and considering the warning introduced in f4a43d2925 ("Makefile: Warn against using CONFIG_SPL_FIT_GENERATOR"), usage of FIT generator is discouraged. Current FIT generator also generates broken output, since commit 3f04db891a ("image: Check for unit addresses in FITs") prohibits using '@' for unit addresses but the generator script still emits the old sematics. Remove the generator script and corresponding call in Makefile, all derivatives should be migrated to binman in order to provide binary images. Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> --- Makefile | 3 - arch/arm/mach-imx/mkimage_fit_atf.sh | 143 --------------------------- 2 files changed, 146 deletions(-) delete mode 100755 arch/arm/mach-imx/mkimage_fit_atf.sh