On Fri, Oct 22, 2021 at 10:42:17AM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng....@nxp.com>
>
> Switch to binman to pack images
Reviewed-by: Patrick Wildt <patr...@blueri.se>
> Signed-off-by: Peng Fan <peng....@nxp.com>
> ---
> arch/arm/dts/imx8mq-phanbell-u-boot.dtsi | 2 ++
> arch/arm/mach-imx/imx8m/Kconfig | 7 ++++---
> board/google/imx8mq_phanbell/Kconfig | 2 +-
> board/google/imx8mq_phanbell/imximage.cfg | 11 +++++++++++
> configs/imx8mq_phanbell_defconfig | 2 +-
> 5 files changed, 19 insertions(+), 5 deletions(-)
> create mode 100644 board/google/imx8mq_phanbell/imximage.cfg
>
> diff --git a/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
> b/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
> index 4712cf6a44..a65a942ee7 100644
> --- a/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
> @@ -1,5 +1,7 @@
> // SPDX-License-Identifier: (GPL-2.0 OR MIT)
>
> +#include "imx8mq-u-boot.dtsi"
> +
> ®_usdhc2_vmmc {
> u-boot,off-on-delay-us = <20000>;
> };
> diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig
> index c556e712b7..b453e5a7da 100644
> --- a/arch/arm/mach-imx/imx8m/Kconfig
> +++ b/arch/arm/mach-imx/imx8m/Kconfig
> @@ -41,9 +41,10 @@ config TARGET_IMX8MQ_EVK
> select IMX8M_LPDDR4
>
> config TARGET_IMX8MQ_PHANBELL
> - bool "imx8mq_phanbell"
> - select IMX8MQ
> - select IMX8M_LPDDR4
> + bool "imx8mq_phanbell"
> + select BINMAN
> + select IMX8MQ
> + select IMX8M_LPDDR4
>
> config TARGET_IMX8MM_EVK
> bool "imx8mm LPDDR4 EVK board"
> diff --git a/board/google/imx8mq_phanbell/Kconfig
> b/board/google/imx8mq_phanbell/Kconfig
> index 54cfb99952..e59b03cb17 100644
> --- a/board/google/imx8mq_phanbell/Kconfig
> +++ b/board/google/imx8mq_phanbell/Kconfig
> @@ -10,6 +10,6 @@ config SYS_CONFIG_NAME
> default "imx8mq_phanbell"
>
> config IMX_CONFIG
> - default "arch/arm/mach-imx/imx8m/imximage.cfg"
> + default "board/google/imx8mq_phanbell/imximage.cfg"
>
> endif
> diff --git a/board/google/imx8mq_phanbell/imximage.cfg
> b/board/google/imx8mq_phanbell/imximage.cfg
> new file mode 100644
> index 0000000000..74f12b30d2
> --- /dev/null
> +++ b/board/google/imx8mq_phanbell/imximage.cfg
> @@ -0,0 +1,11 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * Copyright 2021 NXP
> + */
> +
> +#define __ASSEMBLY__
> +
> +FIT
> +BOOT_FROM sd
> +SIGNED_HDMI signed_hdmi.bin
> +LOADER mkimage.flash.mkimage 0x7e1000
> diff --git a/configs/imx8mq_phanbell_defconfig
> b/configs/imx8mq_phanbell_defconfig
> index 911c3391db..a8eab85b4a 100644
> --- a/configs/imx8mq_phanbell_defconfig
> +++ b/configs/imx8mq_phanbell_defconfig
> @@ -18,7 +18,7 @@ CONFIG_SYS_LOAD_ADDR=0x40480000
> CONFIG_FIT=y
> CONFIG_FIT_EXTERNAL_OFFSET=0x3000
> CONFIG_SPL_LOAD_FIT=y
> -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
> +# CONFIG_USE_SPL_FIT_GENERATOR is not set
> CONFIG_SD_BOOT=y
> CONFIG_BOARD_EARLY_INIT_F=y
> CONFIG_SPL_BOARD_INIT=y
> --
> 2.30.0
>
