From patchwork Sat Apr 13 20:54:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Edwards X-Patchwork-Id: 1923423 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CGOMyVsV; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (unknown [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VH5KY6Q8Dz1yYP for ; Sun, 14 Apr 2024 06:54:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D5C587FA3; Sat, 13 Apr 2024 22:54:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CGOMyVsV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A125787FB5; Sat, 13 Apr 2024 22:54:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7D31987C69 for ; Sat, 13 Apr 2024 22:54:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=cfsworks@gmail.com Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7c8b95f7f73so38104539f.1 for ; Sat, 13 Apr 2024 13:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713041679; x=1713646479; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=10zmAzqimog384XJL/ydDExQv+kXvLu7ARiGF2EEOI0=; b=CGOMyVsV7ULUQAcgy4OnnCb3put6oARgQYPtnP+JlWgpOZHwYhBRkDc5P1FPUCzWwd Ut2ddyHRITD7arAe76S/NEEAHrhBlC4TnybgJ9ZtkYAk1Dx1cwFBikpDXc4MBiy5oF/P oEgIfW2NhpWcZvCMZNIZ61avQi6AJsf1ejlBX/T/T0/utU5rXSskg+uNDgOvWO+ok13e s0PkeCqBVLXDRYhek/CiNXtAiCd45lF00LXW936mssLTzYg9voURQk/jY8h0SZXhh8vO RaGDxJyY9f4bqprGi7iNe+jq5MzlSq1CplPOT6/iGTPTsFxxqO2+VyC6IEBnQ0YXCTpt sk0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713041679; x=1713646479; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=10zmAzqimog384XJL/ydDExQv+kXvLu7ARiGF2EEOI0=; b=Uft3vRdxAmVOdZBgUV229/WQLM1HCcmB1x2hzqyRr8NKHs9teQpkuBmZ7NLWlexF2G yOol32K1uSmUhhHQFEG+UYQEHz7hIoKFco/+QcOknK/vd+JrR9tJ4PnVG30vVD0QrpNt TtK8Gv/A/Z2dwHbzceAU2CdKIc2NtAvQIBaLOTWzgqEu2N+mjVdq/g/SvuWlhSQRcuoj RLoh0Vzd1oMQjYyMSU3bdIzPLtLXUd3sQoMjTLYJaUKyyd6vB1gVfkd9zwEYN3MQ+mXN ocpidfeJhoN9JopJFh/bvf4SP4QGAkrjMILkjT5SnqZD+TKwaVxrobDGp9djSk6bfept UUOQ== X-Forwarded-Encrypted: i=1; AJvYcCVuZ7Wpjla76x/LbP79V17L0p9d2a08uQsmcfSc4gp+UapJyNNFKYxLhvi0cQYPjlxmv2wG9ZB2RO+YghpFcTXSIhmCow== X-Gm-Message-State: AOJu0YxY+aMDyTSm1lvkPeaubEW0XTbqVmoDZGFDTYMKeQ3sdegdItd4 Jd/w1CkW/Wc3t6LKqbGlxdB09hmmyClsxpOCvXWjEtO6WvRz43cd X-Google-Smtp-Source: AGHT+IGSed13i+kTs+4FP7fUSMSix7jYrgCCl4AnyiTxmnyIt7pFu8x1CDfq0Ex9Ukm8gHrEbbtipg== X-Received: by 2002:a05:6e02:1a67:b0:36a:17e9:c2c3 with SMTP id w7-20020a056e021a6700b0036a17e9c2c3mr8395944ilv.2.1713041678987; Sat, 13 Apr 2024 13:54:38 -0700 (PDT) Received: from celestia.nettie.lan ([2001:470:42c4:101:e858:7d5f:e2dd:57ff]) by smtp.gmail.com with ESMTPSA id u11-20020a056638134b00b004828feeda5dsm1906806jad.168.2024.04.13.13.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 13:54:38 -0700 (PDT) From: Sam Edwards X-Google-Original-From: Sam Edwards To: Joshua Riek , Tom Rini , Kever Yang Cc: Jonas Karlman , Eugen Hristev , Christopher Obbard , u-boot@lists.denx.de, Sam Edwards , Florian Klink Subject: [PATCH] configs: turing-rk1: disable SPI flash by default Date: Sat, 13 Apr 2024 14:54:02 -0600 Message-ID: <20240413205402.601298-1-CFSworks@gmail.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 Signed-off-by: Sam Edwards Acked-by: Joshua Riek Reviewed-by: Jonas Karlman --- 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