[PATCH v3 1/2] rockchip: rk3399: do not generate u-boot.rom anymore

[Peter Robinson]

On Mon, 5 May 2025 at 15:47, Quentin Schulz <foss+uboot at 0leil.net> wrote:
>
> From: Quentin Schulz <quentin.schulz at cherry.de>
>
> This was only used on RK3399 Gru Chromebooks and their maintainer
> (Simon) agreed[1] to its removal on the basis that the generic
> u-boot-rockchip-spi.bin is now enough, so let's do that.
>
> At the same time, remove HAS_ROM symbol from the Gru Chromebooks config
> since they were used only for that.
>
> Make sure u-boot-rockchip-spi.bin has the same size of u-boot.rom for
> Chromebooks as that seems to be important.
>
> [1] https://lore.kernel.org/u-boot/CAFLszTh-SewFod8dEOF3+e-wCE1qFF0CyxxR8CbQwy3BRW3k6w@mail.gmail.com/
>
> Reviewed-by: Jonas Karlman <jonas at kwiboo.se>
> Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
> Tested-by: Simon Glass <sjg at chromium.org>  # chromebook-kevin
> Signed-off-by: Quentin Schulz <quentin.schulz at cherry.de>
Reviewed-by: Peter Robinson <pbrobinson at gmail.com>
> ---
>  arch/arm/dts/rk3399-gru-u-boot.dtsi   |  4 +++-
>  arch/arm/dts/rk3399-u-boot.dtsi       | 35 -----------------------------------
>  arch/arm/mach-rockchip/rk3399/Kconfig |  2 --
>  3 files changed, 3 insertions(+), 38 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi
> index 5517176aa4a0bcc11aa292e76be7c4d894a034f7..dfc7be4c621e712cc665e889b9c54d192924827a 100644
> --- a/arch/arm/dts/rk3399-gru-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi
> @@ -15,11 +15,13 @@
>         };
>  };
>
> +#if defined(CONFIG_ROCKCHIP_SPI_IMAGE)
>  &binman {
> -       rom {
> +       simple-bin-spi {
>                 size = <0x800000>;
>         };
>  };
> +#endif
>
>  &cros_ec {
>         ec-interrupt = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>;
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index 70f35b6c197a8bedf2fc09ec66d2aac8e615aa75..587eef9504eccc7a1ea365b5f8aed24756692dcb 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -29,41 +29,6 @@
>         };
>  };
>
> -#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
> -&binman {
> -       multiple-images;
> -       rom {
> -               filename = "u-boot.rom";
> -               size = <0x400000>;
> -               pad-byte = <0xff>;
> -
> -               mkimage {
> -                       args = "-n rk3399 -T rkspi";
> -                       multiple-data-files;
> -#ifdef CONFIG_ROCKCHIP_EXTERNAL_TPL
> -                       rockchip-tpl {
> -                       };
> -#elif defined(CONFIG_TPL)
> -                       u-boot-tpl {
> -                       };
> -#endif
> -                       u-boot-spl {
> -                       };
> -               };
> -               fit {
> -                       type = "blob";
> -                       filename = "u-boot.itb";
> -                       offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
> -               };
> -               u-boot {
> -                       offset = <0x300000>;
> -               };
> -               fdtmap {
> -               };
> -       };
> -};
> -#endif /* CONFIG_ROCKCHIP_SPI_IMAGE && CONFIG_HAS_ROM */
> -
>  &cru {
>         bootph-all;
>  };
> diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
> index b2430207ee9d0130b5a0c303a41a7375c7db26fa..5c21b08a5ae226ad545f8492f21ac16fb2fda98d 100644
> --- a/arch/arm/mach-rockchip/rk3399/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3399/Kconfig
> @@ -5,7 +5,6 @@ choice
>
>  config TARGET_CHROMEBOOK_BOB
>         bool "Asus Flip C101PA Chromebook (RK3399)"
> -       select HAS_ROM
>         select ROCKCHIP_SPI_IMAGE
>         help
>           Bob is a small RK3299-based device similar in apperance to Minnie.
> @@ -16,7 +15,6 @@ config TARGET_CHROMEBOOK_BOB
>
>  config TARGET_CHROMEBOOK_KEVIN
>         bool "Samsung Chromebook Plus (RK3399)"
> -       select HAS_ROM
>         select ROCKCHIP_SPI_IMAGE
>         help
>           Kevin is a RK3399-based convertible chromebook. It has two USB 3.0
>
> --
> 2.49.0
>