[PATCH v2 6/8] rockchip: puma: remove separate fit generator

[Kever Yang]

On 2020/6/4 下午6:09, Heiko Stuebner wrote:
> From: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>
>
> The introduction of the puma-specific generator was mainly a way
> to split the pmu firmware from the ATF binary and not having to
> distribute that 4GB (sparse) image that was created before moving
> to the bl31.elf as base.
>
> Looking at the publically available repository for that separate
> pmu firmware
>      https://git.theobroma-systems.com/rk3399-cortex-m0.git/
> there is also no activity for 3 years and apart from some build
> customizations no other changes were done.
>
> And even then, if changes need to be made, this can very well also
> happen in the atf context itself, so there is no real need to
> diverge from the established build procedure and we can just go
> back to using the main make_fit_atf.py script.
>
> Signed-off-by: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>

Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   .../puma_rk3399/fit_spl_atf.sh                | 94 -------------------
>   configs/puma-rk3399_defconfig                 |  1 -
>   2 files changed, 95 deletions(-)
>   delete mode 100755 board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
>
> diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh b/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
> deleted file mode 100755
> index c9396577a9..0000000000
> --- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.sh
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -#!/bin/sh
> -#
> -# SPDX-License-Identifier:      GPL-2.0+
> -#
> -# Copyright (C) 2019 Jagan Teki <jagan at amarulasolutions.com>
> -#
> -# Based on the board/sunxi/mksunxi_fit_atf.sh
> -#
> -# Script to generate FIT image source for 64-bit puma boards with
> -# U-Boot proper, ATF, PMU firmware and devicetree.
> -#
> -# usage: $0 <dt_name> [<dt_name> [<dt_name] ...]
> -
> -[ -z "$BL31" ] && BL31="bl31.bin"
> -
> -if [ ! -f $BL31 ]; then
> -	echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2
> -	echo "Please read Building section in doc/README.rockchip" >&2
> -	BL31=/dev/null
> -fi
> -
> -[ -z "$PMUM0" ] && PMUM0="rk3399m0.bin"
> -
> -if [ ! -f $PMUM0 ]; then
> -	echo "WARNING: PMUM0 file $PMUM0 NOT found, resulting binary is non-functional" >&2
> -	echo "Please read Building section in doc/README.rockchip" >&2
> -	PMUM0=/dev/null
> -fi
> -
> -cat << __HEADER_EOF
> -/* SPDX-License-Identifier: GPL-2.0+ OR X11 */
> -/*
> - * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
> - *
> - * Minimal dts for a SPL FIT image payload.
> - */
> -
> -/dts-v1/;
> -
> -/ {
> -	description = "FIT image with U-Boot proper, ATF bl31, M0 Firmware, DTB";
> -	#address-cells = <1>;
> -
> -	images {
> -		uboot {
> -			description = "U-Boot (64-bit)";
> -			data = /incbin/("u-boot-nodtb.bin");
> -			type = "standalone";
> -			arch = "arm64";
> -			compression = "none";
> -			load = <0x4a000000>;
> -		};
> -		atf {
> -			description = "ARM Trusted Firmware";
> -			data = /incbin/("$BL31");
> -			type = "firmware";
> -			arch = "arm64";
> -			os = "arm-trusted-firmware";
> -			compression = "none";
> -			load = <0x1000>;
> -			entry = <0x1000>;
> -		};
> -		pmu {
> -		        description = "Cortex-M0 firmware";
> -			data = /incbin/("$PMUM0");
> -			type = "pmu-firmware";
> -			compression = "none";
> -			load = <0x180000>;
> -                };
> -		fdt {
> -			description = "RK3399-Q7 (Puma) flat device-tree";
> -			data = /incbin/("$1");
> -			type = "flat_dt";
> -			compression = "none";
> -		};
> -__HEADER_EOF
> -
> -cat << __CONF_HEADER_EOF
> -	};
> -
> -	configurations {
> -		default = "conf";
> -		conf {
> -			description = "Theobroma Systems RK3399-Q7 (Puma) SoM";
> -			firmware = "atf";
> -			loadables = "uboot", "pmu";
> -			fdt = "fdt";
> -		};
> -__CONF_HEADER_EOF
> -
> -cat << __ITS_EOF
> -	};
> -};
> -__ITS_EOF
> diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
> index 47a60930b6..31d4eb3471 100644
> --- a/configs/puma-rk3399_defconfig
> +++ b/configs/puma-rk3399_defconfig
> @@ -14,7 +14,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
>   CONFIG_SPL_SPI_SUPPORT=y
>   CONFIG_SPL_TEXT_BASE=0xff8c2000
>   CONFIG_DEBUG_UART=y
> -CONFIG_SPL_FIT_GENERATOR="board/theobroma-systems/puma_rk3399/fit_spl_atf.sh"
>   CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb"
>   CONFIG_MISC_INIT_R=y
>   CONFIG_DISPLAY_BOARDINFO_LATE=y