[PATCH] configs: turing-rk1: disable SPI flash by default

[Jonas Karlman]

Hi Sam,

On 2024-04-13 09:25, Sam Edwards wrote:
> While the Turing RK1 board has a pad on the PCB for SPI flash, it is
> not populated at the factory: supporting SPI flash boot is a user
> modification, not an out-of-the-box feature. The defconfig for this
> board should therefore not be enabling the SPI flash image nor SPI
> support in the SPL, as it causes confusion among downstream users as to
> whether the SPI image needs to be distributed.
> 
> Fixes: 153ac950a599 ("board: rockchip: Add the Turing RK1 SoM")
> Suggested-by: Florian Klink <flokli at flokli.de>
> Signed-off-by: Sam Edwards <CFSworks at gmail.com>
> Acked-by: Joshua Riek <jjriek at verizon.net>
> ---
>  configs/turing-rk1-rk3588_defconfig | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/configs/turing-rk1-rk3588_defconfig b/configs/turing-rk1-rk3588_defconfig
> index 07f7b84852..28c3e50ed4 100644
> --- a/configs/turing-rk1-rk3588_defconfig
> +++ b/configs/turing-rk1-rk3588_defconfig
> @@ -8,13 +8,10 @@ CONFIG_SF_DEFAULT_SPEED=24000000
>  CONFIG_SF_DEFAULT_MODE=0x2000
>  CONFIG_DEFAULT_DEVICE_TREE="rk3588-turing-rk1"
>  CONFIG_ROCKCHIP_RK3588=y
> -CONFIG_ROCKCHIP_SPI_IMAGE=y

The device tree synced from linux does not even enable the sfc node, so
please either remove all related config options for spi flash or only
remove the ROCKCHIP_SPI_IMAGE option if the sfc and a flash node will
be enabled/added to upstream linux devicetree.

Additional options related to spi flash not removed in this patch:
- SF_DEFAULT_SPEED
- SF_DEFAULT_MODE
- SF_DEFAULT_BUS
- SPI_FLASH_SFDP_SUPPORT
- SPI_FLASH_MACRONIX
- SPI_FLASH_XMC
- SPI_FLASH_XTX
- ROCKCHIP_SFC

>  CONFIG_SPL_SERIAL=y
>  CONFIG_TARGET_TURINGRK1_RK3588=y
>  CONFIG_DEBUG_UART_BASE=0xFEBC0000
>  CONFIG_DEBUG_UART_CLOCK=24000000
> -CONFIG_SPL_SPI_FLASH_SUPPORT=y
> -CONFIG_SPL_SPI=y
>  CONFIG_SYS_LOAD_ADDR=0xc00800
>  CONFIG_PCI=y
>  CONFIG_DEBUG_UART=y
> @@ -31,8 +28,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
>  CONFIG_SPL_MAX_SIZE=0x40000
>  CONFIG_SPL_PAD_TO=0x7f8000
>  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -CONFIG_SPL_SPI_LOAD=y
> -CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
>  CONFIG_SPL_ATF=y
>  CONFIG_CMD_GPIO=y
>  CONFIG_CMD_GPT=y
> @@ -109,7 +104,6 @@ CONFIG_USB_ETHER_MCS7830=y
>  CONFIG_USB_ETHER_RTL8152=y
>  CONFIG_USB_ETHER_SMSC95XX=y
>  CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_PRODUCT_NUM=0x350b

This is an unrelated change that may cause apply issues if "rockchip:
rk35xx: DropUSB_GADGET_PRODUCT_NUM Kconfig option" [1] or is Tom make a
sync defconfigs commit that is applied before this patch.

[1] https://patchwork.ozlabs.org/patch/1917934/

With above fixed,

Reviewed-by: Jonas Karlman <jonas at kwiboo.se>

Regards,
Jonas

>  CONFIG_USB_GADGET_DOWNLOAD=y
>  CONFIG_USB_FUNCTION_ROCKUSB=y
>  CONFIG_ERRNO_STR=y