From: Quentin Schulz <quentin.sch...@cherry.de> This was only used on RK3288 Chromebooks and the EVB.
If it follows the same pattern as for RK3399 Chromebooks where their maintainer (Simon) agreed[1] to removal of u-boot.rom on the basis that the generic u-boot-rockchip-spi.bin is now enough, let's do the same for RK3288 and remove the last Rockchip users of u-boot.rom (and HAS_ROM symbol). At the same time, remove HAS_ROM symbol from the RK3288 Chromebooks and EVB configs since they were used only for that. SYS_SPI_U_BOOT_OFFS offset in rockchip-u-boot.dtsi for the u-boot-img node of simple-bin-spi binman image matches the one used in u-boot.rom except for the EVB. The EVB doesn't have ROCKCHIP_SPI_IMAGE symbol enabled, so HAS_ROM had no effect anyway. Even if it had, this would not have been enough considering that SPL_SPI_LOAD symbol is not set, so U-Boot proper could not be loaded from SPI even if SPL/TPL does. [1] https://lore.kernel.org/u-boot/caflszth-sewfod8deof3+e-wce1qff0cyxxr8cbqwy3brw3...@mail.gmail.com/ Signed-off-by: Quentin Schulz <quentin.sch...@cherry.de> --- arch/arm/dts/rk3288-u-boot.dtsi | 24 ------------------------ arch/arm/mach-rockchip/rk3288/Kconfig | 5 ----- 2 files changed, 29 deletions(-) diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi index 2205caabc51ec4535bef3ab950d7ff5b421d8016..bb0078588fe819118eb0592e002e1708da7ce806 100644 --- a/arch/arm/dts/rk3288-u-boot.dtsi +++ b/arch/arm/dts/rk3288-u-boot.dtsi @@ -46,30 +46,6 @@ }; }; -#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM) -&binman { - rom { - filename = "u-boot.rom"; - size = <0x400000>; - pad-byte = <0xff>; - - mkimage { - args = "-n rk3288 -T rkspi"; - u-boot-spl { - }; - }; - u-boot-img { - offset = <0x20000>; - }; - u-boot { - offset = <0x300000>; - }; - fdtmap { - }; - }; -}; -#endif - &bus_intmem { ddr_sram: ddr-sram@1000 { compatible = "rockchip,rk3288-ddr-sram"; diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index e563bf455e6803809c7d7612bb3aa85372034292..128ee362f8a8af69861030df7b63cf0e5a368956 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -5,7 +5,6 @@ choice config TARGET_CHROMEBOOK_JERRY bool "Google/Rockchip Veyron-Jerry Chromebook" - select HAS_ROM select BOARD_LATE_INIT select ROCKCHIP_SPI_IMAGE help @@ -16,7 +15,6 @@ config TARGET_CHROMEBOOK_JERRY config TARGET_CHROMEBIT_MICKEY bool "Google/Rockchip Veyron-Mickey Chromebit" - select HAS_ROM select BOARD_LATE_INIT select ROCKCHIP_SPI_IMAGE help @@ -28,7 +26,6 @@ config TARGET_CHROMEBIT_MICKEY config TARGET_CHROMEBOOK_MINNIE bool "Google/Rockchip Veyron-Minnie Chromebook" - select HAS_ROM select BOARD_LATE_INIT select ROCKCHIP_SPI_IMAGE help @@ -41,7 +38,6 @@ config TARGET_CHROMEBOOK_MINNIE config TARGET_CHROMEBOOK_SPEEDY bool "Google/Rockchip Veyron-Speedy Chromebook" - select HAS_ROM select BOARD_LATE_INIT select ROCKCHIP_SPI_IMAGE help @@ -54,7 +50,6 @@ config TARGET_CHROMEBOOK_SPEEDY config TARGET_EVB_RK3288 bool "Evb-RK3288" - select HAS_ROM select BOARD_LATE_INIT select TPL help -- 2.48.1
