[PATCH v3 3/3] board: phytec: imx93: Add phyCORE-i.MX 93 support for all SOM variants

[Yannic Moog]

On Tue, 2024-11-19 at 17:29 +0100, Christoph Stoidner wrote:
> The phyCORE-i.MX 93 is available in various variants (e.g. different ram
> sizes, eMMC HS400 yes/no). Enable hardware introspection for the
> imx93-phyboard-segin_defconfig, so that during startup the SOM module
> variant can be detected, and the hardware can be configured accordingly.
> The resulting SPL and u-boot binary shall able to boot each
> phyCORE-i.MX 93 module variant on each carrier board. Finally rename
> imx93-phyboard-segin_defconfig to imx93-phycore_defconfig, to highlight
> its SOM scope.
> 
> Signed-off-by: Christoph Stoidner <c.stoidner at phytec.de>
> Reviewed-by: Wadim Egorov <w.egorov at phytec.de>

Reviewed-by: Yannic Moog <y.moog at phytec.de>

> ---
> Cc: Mathieu Othacehe <m.othacehe at gmail.com>
> Cc: Christoph Stoidner <c.stoidner at phytec.de>
> Cc: Stefano Babic <sbabic at denx.de>
> Cc: Fabio Estevam <festevam at gmail.com>
> Cc: "NXP i.MX U-Boot Team" <uboot-imx at nxp.com>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Yannic Moog <y.moog at phytec.de>
> Cc: Primoz Fiser <primoz.fiser at norik.com>
> Cc: Andrej Picej <andrej.picej at norik.com>
> Cc: Wadim Egorov <w.egorov at phytec.de>
> ---
> Changes in v3:
> - add comment about SoM-scope to imx93-phyboard-segin-u-boot.dtsi
> - rebase to the latest master
> - adapt doc according to new defconfig
> 
> Changes in v2:
> - just rename imx93-phyboard-segin_defconfig and add needed CONFIGs,
>   instead of creating an entirely new second defconfig
> - remove wrong comment from imx93-phyboard-segin-u-boot.dtsi
> - improve commit message
> 
>  arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi         | 11 +++++++++--
>  board/phytec/phycore_imx93/MAINTAINERS                |  2 +-
>  ...yboard-segin_defconfig => imx93-phycore_defconfig} |  2 ++
>  .../{imx93-phyboard-segin.rst => imx93-phycore.rst}   |  8 ++++----
>  doc/board/phytec/index.rst                            |  2 +-
>  5 files changed, 17 insertions(+), 8 deletions(-)
>  rename configs/{imx93-phyboard-segin_defconfig => imx93-phycore_defconfig} (98%)
>  rename doc/board/phytec/{imx93-phyboard-segin.rst => imx93-phycore.rst} (91%)
> 
> diff --git a/arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi b/arch/arm/dts/imx93-phyboard-segin-u-
> boot.dtsi
> index e001ee3288..635e298507 100644
> --- a/arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi
> +++ b/arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi
> @@ -2,15 +2,22 @@
>  /*
>   * Copyright (C) 2023 PHYTEC Messtechnik GmbH
>   * Christoph Stoidner <c.stoidner at phytec.de>
> + * Copyright (C) 2024 PHYTEC Messtechnik GmbH
>   *
>   * Product homepage:
> - * phyBOARD-Segin carrier board is reused for the i.MX93 design.
> - * https://www.phytec.eu/en/produkte/single-board-computer/phyboard-segin-imx6ul/
> +   https://www.phytec.de/produkte/system-on-modules/phycore-imx-91-93/
>   */
>  
>  #include "imx93-u-boot.dtsi"
>  
>  / {
> +	/*
> +	 * The phyCORE-i.MX93 u-boot uses the imx93-phyboard-segin.dts as
> +	 * reference, but does only make use of its SoM (phyCORE) contained
> +	 * periphery.
> +	 */
> +	model = "PHYTEC phyCORE-i.MX93";
> +
>  	wdt-reboot {
>  		compatible = "wdt-reboot";
>  		wdt = <&wdog3>;
> diff --git a/board/phytec/phycore_imx93/MAINTAINERS b/board/phytec/phycore_imx93/MAINTAINERS
> index cea817ffdc..718f89a084 100644
> --- a/board/phytec/phycore_imx93/MAINTAINERS
> +++ b/board/phytec/phycore_imx93/MAINTAINERS
> @@ -9,5 +9,5 @@ F:      arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi
>  F:      board/phytec/phycore_imx93/
>  F:      board/phytec/common/imx93_som_detection.c
>  F:      board/phytec/common/imx93_som_detection.h
> -F:      configs/imx93-phyboard-segin_defconfig
> +F:      configs/imx93-phycore_defconfig
>  F:      include/configs/phycore_imx93.h
> diff --git a/configs/imx93-phyboard-segin_defconfig b/configs/imx93-phycore_defconfig
> similarity index 98%
> rename from configs/imx93-phyboard-segin_defconfig
> rename to configs/imx93-phycore_defconfig
> index 309262c430..cf9800118a 100644
> --- a/configs/imx93-phyboard-segin_defconfig
> +++ b/configs/imx93-phycore_defconfig
> @@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x20000
>  CONFIG_SPL_LIBCOMMON_SUPPORT=y
>  CONFIG_SPL_LIBGENERIC_SUPPORT=y
>  CONFIG_NR_DRAM_BANKS=2
> +CONFIG_PHYTEC_SOM_DETECTION=y
>  CONFIG_ENV_SOURCE_FILE="phycore_imx93"
>  CONFIG_ENV_SIZE=0x10000
>  CONFIG_ENV_OFFSET=0x700000
> @@ -31,6 +32,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
>  CONFIG_SYS_MEMTEST_START=0x80000000
>  CONFIG_SYS_MEMTEST_END=0x90000000
>  CONFIG_REMAKE_ELF=y
> +# CONFIG_ANDROID_BOOT_IMAGE is not set
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_OF_SYSTEM_SETUP=y
>  CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadimage; then run mmcboot;
> else run netboot; fi; fi;"
> diff --git a/doc/board/phytec/imx93-phyboard-segin.rst b/doc/board/phytec/imx93-phycore.rst
> similarity index 91%
> rename from doc/board/phytec/imx93-phyboard-segin.rst
> rename to doc/board/phytec/imx93-phycore.rst
> index ce17fbec78..bd110a3ebe 100644
> --- a/doc/board/phytec/imx93-phyboard-segin.rst
> +++ b/doc/board/phytec/imx93-phycore.rst
> @@ -1,9 +1,9 @@
>  .. SPDX-License-Identifier: GPL-2.0+
>  
> -phyBOARD-Segin-i.MX93
> -=====================
> +phyCORE-i.MX 93
> +===============
>  
> -U-Boot for the phyBOARD-Segin-i.MX93.
> +U-Boot for the phyCORE-i.MX 93.
>  
>  Quick Start
>  -----------
> @@ -51,7 +51,7 @@ Build U-Boot
>  
>  .. code-block:: bash
>  
> -   $ make imx93-phyboard-segin_defconfig
> +   $ make imx93-phycore_defconfig
>     $ make
>  
>  Burn the flash.bin to MicroSD card offset 32KB:
> diff --git a/doc/board/phytec/index.rst b/doc/board/phytec/index.rst
> index 99848a9e95..fa30697464 100644
> --- a/doc/board/phytec/index.rst
> +++ b/doc/board/phytec/index.rst
> @@ -7,7 +7,7 @@ PHYTEC
>     :maxdepth: 2
>  
>     imx8mm-phygate-tauri-l
> -   imx93-phyboard-segin
> +   imx93-phycore
>     phycore-am62x
>     phycore-am64x
>     phycore-imx8mm