Re: [PATCH v2 1/3] rockchip: rk3399: do not generate u-boot.rom anymore

[Kever Yang]

On 2025/2/21 00:56, Quentin Schulz wrote:

From: Quentin Schulz <quentin.sch...@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-wce1qff0cyxxr8cbqwy3brw3...@mail.gmail.com/

Reviewed-by: Jonas Karlman <jo...@kwiboo.se>
Signed-off-by: Quentin Schulz <quentin.sch...@cherry.de>

Reviewed-by: Kever Yang <kever.y...@rock-chips.com>

Thanks,
- Kever

---
  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 
500cfcd87afd23782bb64d231e337330e12497da..bdfd79458f56d2dfca31462db7a9023dabb156e8
 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