* [PATCH] configs: turing-rk1: disable SPI flash by default
@ 2024-04-13 7:25 Sam Edwards
2024-04-13 8:21 ` Jonas Karlman
0 siblings, 1 reply; 3+ messages in thread
From: Sam Edwards @ 2024-04-13 7:25 UTC (permalink / raw
To: Joshua Riek, Tom Rini, Kever Yang
Cc: Jonas Karlman, Eugen Hristev, Christopher Obbard, u-boot,
Sam Edwards, Florian Klink
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@flokli.de>
Signed-off-by: Sam Edwards <CFSworks@gmail.com>
Acked-by: Joshua Riek <jjriek@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
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
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_USB_FUNCTION_ROCKUSB=y
CONFIG_ERRNO_STR=y
--
2.43.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] configs: turing-rk1: disable SPI flash by default
2024-04-13 7:25 [PATCH] configs: turing-rk1: disable SPI flash by default Sam Edwards
@ 2024-04-13 8:21 ` Jonas Karlman
0 siblings, 0 replies; 3+ messages in thread
From: Jonas Karlman @ 2024-04-13 8:21 UTC (permalink / raw
To: Sam Edwards, Joshua Riek, Tom Rini, Kever Yang
Cc: Eugen Hristev, Christopher Obbard, u-boot, Florian Klink
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@flokli.de>
> Signed-off-by: Sam Edwards <CFSworks@gmail.com>
> Acked-by: Joshua Riek <jjriek@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@kwiboo.se>
Regards,
Jonas
> CONFIG_USB_GADGET_DOWNLOAD=y
> CONFIG_USB_FUNCTION_ROCKUSB=y
> CONFIG_ERRNO_STR=y
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] configs: turing-rk1: disable SPI flash by default
@ 2024-04-13 20:54 Sam Edwards
0 siblings, 0 replies; 3+ messages in thread
From: Sam Edwards @ 2024-04-13 20:54 UTC (permalink / raw
To: Joshua Riek, Tom Rini, Kever Yang
Cc: Jonas Karlman, Eugen Hristev, Christopher Obbard, u-boot,
Sam Edwards, Florian Klink
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@flokli.de>
Signed-off-by: Sam Edwards <CFSworks@gmail.com>
Acked-by: Joshua Riek <jjriek@verizon.net>
Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
---
Changes v1->v2 (both requested by Jonas):
- Added back (i.e. made unremoved by patch) CONFIG_USB_GADGET_PRODUCT_NUM value
previously automatically removed by savedefconfig.
- Also disable SPI/SFC driver entirely until SPI/SFC lands in the DT (if ever).
---
configs/turing-rk1-rk3588_defconfig | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/configs/turing-rk1-rk3588_defconfig b/configs/turing-rk1-rk3588_defconfig
index 07f7b84852..f500b0cf75 100644
--- a/configs/turing-rk1-rk3588_defconfig
+++ b/configs/turing-rk1-rk3588_defconfig
@@ -4,17 +4,12 @@ CONFIG_SYS_HAS_NONCACHED_MEMORY=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_NR_DRAM_BANKS=2
-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
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 +26,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
@@ -66,11 +59,7 @@ CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_SDMA=y
CONFIG_MMC_SDHCI_ROCKCHIP=y
-CONFIG_SF_DEFAULT_BUS=5
-CONFIG_SPI_FLASH_SFDP_SUPPORT=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_XMC=y
-CONFIG_SPI_FLASH_XTX=y
+# CONFIG_SPI_FLASH is not set
CONFIG_PHY_REALTEK=y
CONFIG_DWC_ETH_QOS=y
CONFIG_DWC_ETH_QOS_ROCKCHIP=y
@@ -87,7 +76,6 @@ CONFIG_SPL_RAM=y
CONFIG_SCSI=y
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
-CONFIG_ROCKCHIP_SFC=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
--
2.43.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-13 20:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-13 7:25 [PATCH] configs: turing-rk1: disable SPI flash by default Sam Edwards
2024-04-13 8:21 ` Jonas Karlman
-- strict thread matches above, loose matches on Subject: below --
2024-04-13 20:54 Sam Edwards
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.