From patchwork Tue Nov 1 05:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697617 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=qgPH7Psn; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=EFDNVWiA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dNB2NnKz23lC for ; Tue, 1 Nov 2022 16:08:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C51184E2B; Tue, 1 Nov 2022 06:08:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="qgPH7Psn"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="EFDNVWiA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C881D84E2B; Tue, 1 Nov 2022 06:08:43 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DF7E584D3C for ; Tue, 1 Nov 2022 06:08:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id D20503200893; Tue, 1 Nov 2022 01:08:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 01 Nov 2022 01:08:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279318; x=1667365718; bh=4T IRm63eb/iHVLm+hThe9mAYWkXjujtrl+hL/NuU0pQ=; b=qgPH7Psn49Z28uJzu/ AWEnoTB6+VnrZObSp3cF0rKJCsXL1mRClv9vDT4CnEUWbfhBYVtVldBTxKbwoYjN kKX8w7fOJcKDNyCOEzzWukBPLsA+4dJ5y1snsLys3MOX4E+PTYvUbEca/Mw6DqJ4 ReZqvBlSzYFKw8QC25QH+ajoRWPJEmRXZJyUfi4EpVA0LY3w8NChI+g7/D/LGwcx MhqV4J2JLZ8zygWHJvc0k8BwHaEScApPXRIIVsAFj1b/0Q5yXVEMYZuQjVP2SlVb S4oxE4i/MjyyPV6S6N2Yea07GiCTdn+gKv+4wrTENL6Bdg9aYKSo80zFNwz7fUBY wqxw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279318; x=1667365718; bh=4TIRm63eb/iHV Lm+hThe9mAYWkXjujtrl+hL/NuU0pQ=; b=EFDNVWiAiI468WTSmoQYwD01h7rjJ b5qsJbpovVQMQhQ5jBcc77WM1lSyG1CK3L84wJJvoCx6Viof5NuPtahevL8Cdfl3 lVb8rCsMqpgs1qmHXbgx6lUF45wpFZelFDkBSIOPDKhBfifSy8S0WljlAaL/Yk+0 4Nm419/YlYnje8Q46BXfNN+ZB1YgAlJZ/sIOBApDYz40gaCrhUrpnV1xdBpez26u 3E3CMHdJ8JN2G2PdNLIY2Ru2xdTzE5wL8YcoTAqifMy7EqsrQ1lhRFVv8kb4N5lO FR5Q2OSim46JXMHygkt0Z9Z88iija+tfgNJgvJ+8Q69OiMInCc5weiF3g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:37 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 01/22] sunxi: Fix default-enablement of USB host drivers Date: Tue, 1 Nov 2022 00:08:13 -0500 Message-Id: <20221101050835.2421-2-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean We tried to enable USB_EHCI_GENERIC and USB_OHCI_GENERIC by default. This did not work because those symbols depend on USB_EHCI_HCD and USB_OHCI_HCD, which were not enabled. Fix this by implying all four. Signed-off-by: Samuel Holland --- arch/arm/Kconfig | 4 ++++ drivers/usb/host/Kconfig | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 710f171f87..d3a1f03b36 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1185,7 +1185,11 @@ config ARCH_SUNXI imply SYSRESET imply SYSRESET_WATCHDOG imply SYSRESET_WATCHDOG_AUTO + imply USB_EHCI_GENERIC + imply USB_EHCI_HCD imply USB_GADGET + imply USB_OHCI_GENERIC + imply USB_OHCI_HCD imply WDT config ARCH_U8500 diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 1aabe062fb..a4d62bc9e8 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -280,7 +280,6 @@ config USB_EHCI_ZYNQ config USB_EHCI_GENERIC bool "Support for generic EHCI USB controller" depends on DM_USB - default ARCH_SUNXI ---help--- Enables support for generic EHCI controller. @@ -342,7 +341,6 @@ config USB_OHCI_PCI config USB_OHCI_GENERIC bool "Support for generic OHCI USB controller" - default ARCH_SUNXI ---help--- Enables support for generic OHCI controller. From patchwork Tue Nov 1 05:08:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697619 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=F/BM/8sx; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=j9S1TyIR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dNY4kK7z23lC for ; Tue, 1 Nov 2022 16:09:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 92ECB84EBB; Tue, 1 Nov 2022 06:08:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="F/BM/8sx"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="j9S1TyIR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C9B1C84D9F; Tue, 1 Nov 2022 06:08:45 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3A86584D9F for ; Tue, 1 Nov 2022 06:08:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 8163C3200922; Tue, 1 Nov 2022 01:08:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:08:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279320; x=1667365720; bh=tp 4uTE80LKHMSAfE52JTXqyXk7IKCnFUuufmyu66hH8=; b=F/BM/8sxWQsF5N+zEL 3ERzMDuxid7uKToPD2vhyGardxePXu7PNsE5qW/ACBln0ig7hG/93ZpfgjAUt3Te DPZdiCKIxer1+wQdiU46LZJf8oI1h5tAVEyD9U1mjNMY8xdFnOX2jNFqC+OsPY/s RBr+ctN9IRNZgZOrbEE5tgz+0boroabEpe4bSzb/jkdk0NGTLdZPSncEbS0/v4Nh HsboPocY9lsrnF74lboe/EkbKI85VlGSO1PXZjQvv5o24XJEO32nBG/+g8jR6+Im NhXFo78/9zfOrCV15izzmSLmfW0ULKgdnQxogAmhl7+qyWaAo8v2FYkFFC3lTa+3 zqww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279320; x=1667365720; bh=tp4uTE80LKHMS AfE52JTXqyXk7IKCnFUuufmyu66hH8=; b=j9S1TyIRy4xLp84fP/9+nWMoQkV+f RNH8nNFcI/sLdv0m4DmeYP4pVo6mAxCZAfJK0DBcDgCseeudo1Y8knlbdMwSDkGg RbH1R6aU2OnchBPJRft+zG45jztNHwCyzet8qvX/R3P96x+GdrzTkmNzjhyR7fsW Delq4OQ28tcjIZp2p0/DJ6SUqSIH4U6empgyTFDbApiabIMFp10mAwQv8ScTHan+ YDKOuSDL9uoyMduhwzOOEK1cbfriUq1vB6aHMH5CbXRRTWFprqId7tEgAs0UkYxo 2Mm9LMHYHx+wup8b+Tr+JI4iNkuQZTVjNHg18GfuaiK/S2+VenvEZzGPA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:39 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 02/22] sunxi: Remove unnecessary Kconfig selections Date: Tue, 1 Nov 2022 00:08:14 -0500 Message-Id: <20221101050835.2421-3-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean Two of these selections are redundant and have no effect: - DM_KEYBOARD is selected by USB_KEYBOARD - DM_MMC is selected by MMC This selection has no effect by default and is unnecessarily strong: - USB_STORAGE is implied by DISTRO_DEFAULTS Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara --- arch/arm/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d3a1f03b36..939f76867e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1144,8 +1144,6 @@ config ARCH_SUNXI select DM_I2C if I2C select DM_SPI if SPI select DM_SPI_FLASH if SPI - select DM_KEYBOARD - select DM_MMC if MMC select DM_SCSI if SCSI select DM_SERIAL select GPIO_EXTRA_HEADER @@ -1163,7 +1161,6 @@ config ARCH_SUNXI select SYS_THUMB_BUILD if !ARM64 select USB if DISTRO_DEFAULTS select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST - select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST select SPL_USE_TINY_PRINTF select USE_PREBOOT select SYS_RELOC_GD_ENV_ADDR From patchwork Tue Nov 1 05:08:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697620 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=aYOB3isp; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=hH/28DGW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dNp3xZjz23lC for ; Tue, 1 Nov 2022 16:09:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2057584EF3; Tue, 1 Nov 2022 06:08:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="aYOB3isp"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="hH/28DGW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E4AD84D9F; Tue, 1 Nov 2022 06:08:46 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C7D1B84E00 for ; Tue, 1 Nov 2022 06:08:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 2476B3200927; Tue, 1 Nov 2022 01:08:42 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 01 Nov 2022 01:08:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279321; x=1667365721; bh=eE mDChPcrO+VepAHOm6Y+c0UN1zFtCT1+iFGGBcvMFU=; b=aYOB3ispH2tsH7iQop bvWSDTIn+bZbYKn5mCqSWlCG10c06hwZ/UyefaXoHNEYG2LtLz22b06qLUshfTp6 c5bnhZ16cQcE7s/7NCwHSuN2/euSdsB7TS0N83WZcsYQDvSAFqcWGGHvmTVMXZMK lThZyCk+2wWHdekGf764Y3Z8w+bjYu4FlY2lZhfu6Rx6bhECSzhegWd1I4+famgW 19UasvYYkxAV/gMy00VBRC3pg0iu4X32xWMSky8kFERFJ62PwXWgdzoI2oKU2oeb 1J82Bf9/8w5992KLdQogpf5Rtj0GoNOr/GPyspNzFn2nTQs/XU76+lZnp4Jtjq2z xZmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279321; x=1667365721; bh=eEmDChPcrO+Ve pAHOm6Y+c0UN1zFtCT1+iFGGBcvMFU=; b=hH/28DGWFE8sqlhd25rFWW5U+dWXQ xB8XIWVrAYnRBNIGkAL9lNYvwkvq0uf4TulCmJ1Xdmd9RqIRkiYSuT4N/CjPt8EX Kma5bXckZEkrD52baLVRoNoLS8aWwGIdVlZ4oyZFDFR0DPPnB72sUBad4YDCP6Wq CZd66w+LPHDmJqkZbCOXS9aYarkhs8h5hhq0XwH8hCxWRCwd5a9vRGxHdegmUe7U oT7vcpFXsfxnpvOnvZxrcM5vL8uHJ7jmO9O2W//9TmmVBjOwsO5oE8KLkKZKvqxJ XjZ/jXWYmZkDXPik7ChXNxZj9yAlTstN7lEqHne8ChJLQK3F2y/NPIaDA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:41 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 03/22] sunxi: Add missing dependencies to Kconfig selections Date: Tue, 1 Nov 2022 00:08:15 -0500 Message-Id: <20221101050835.2421-4-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean Some of the selected symbols have a user-visible dependency. Make the selections conditional on that dependency to avoid creating invalid configurations. Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara --- arch/arm/Kconfig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 939f76867e..4e5daa9e7f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1134,30 +1134,30 @@ config ARCH_SOCFPGA config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" select BINMAN - select CMD_GPIO + select CMD_GPIO if GPIO select CMD_MMC if MMC select CMD_USB if DISTRO_DEFAULTS && USB_HOST select CLK select DM - select DM_ETH - select DM_GPIO + select DM_ETH if NET + select DM_GPIO if GPIO select DM_I2C if I2C + select DM_SCSI if BLK && SCSI + select DM_SERIAL if SERIAL select DM_SPI if SPI select DM_SPI_FLASH if SPI - select DM_SCSI if SCSI - select DM_SERIAL select GPIO_EXTRA_HEADER select OF_BOARD_SETUP select OF_CONTROL select OF_SEPARATE select PINCTRL - select SPECIFY_CONSOLE_INDEX + select SPECIFY_CONSOLE_INDEX if SERIAL select SPL_SEPARATE_BSS if SPL select SPL_STACK_R if SPL select SPL_SYS_MALLOC_SIMPLE if SPL select SPL_SYS_THUMB_BUILD if !ARM64 - select SUNXI_GPIO - select SYS_NS16550 + select SUNXI_GPIO if GPIO + select SYS_NS16550 if SERIAL select SYS_THUMB_BUILD if !ARM64 select USB if DISTRO_DEFAULTS select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST From patchwork Tue Nov 1 05:08:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697621 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=L3W76JYN; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=nDMjT7F7; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dP449Vvz23lC for ; Tue, 1 Nov 2022 16:09:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA6A584D9F; Tue, 1 Nov 2022 06:08:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="L3W76JYN"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="nDMjT7F7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C428084EC7; Tue, 1 Nov 2022 06:08:47 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B18B984E83 for ; Tue, 1 Nov 2022 06:08:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id C0D2B3200930; Tue, 1 Nov 2022 01:08:43 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 01 Nov 2022 01:08:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279323; x=1667365723; bh=Wy LKHr33oq7s+AjjpOTa2epQgY1aHINxkdFdHp6AeXc=; b=L3W76JYNT9rsDHwULr +WuMg3oIVUYqarq1NQOlEnjgaNl24GxJg0R5i9+lTZzT8dxMCsDRWnoLSdbQBq+a xw13UdRn5grsJZ8B3jdM8AzB/Ap+ksbk/GugBQ+y5H1LS8vEllvcoLNUocKdfqxm 9q4Oi/H1cAF0+csnsm3zLYNNtn695nTx/Ctw1+LEk2ABPsXPJUPwwuMGXDnwaI1Q yMuR9rdMspWfDaHS7LitECEd5mjoHmNtIQT/3QrD7ujY6VTeaDhaOMjpCfUF4h7q YddvFzx6xEcV7LMX0eWgOvh2AwMMDoNqRcOEekVm0RkTLBwX8F+nUFjSRPePqU43 ItFg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279323; x=1667365723; bh=WyLKHr33oq7s+ AjjpOTa2epQgY1aHINxkdFdHp6AeXc=; b=nDMjT7F71CqBOIjEt1zPhQoXSzJNA shSJ3ScR90Pd7f2qMjQDJiiXnH8GRUnc6GFK7Tb6p5VNcLqJb9ZjQK24wQxqzrRK g0Cj+5pdxqMeCwROE+4Mybpn9BG1o28VZj2cwR5rSntt+sCJ0u1fi4ZBgsXNzr9Y SX4rjOtmaC6Dcknmk6zsjKvstHUfRCyswvyFJotf2wR33eAoQta+DfwZ7XhOLwsR Z4vdLreZkPtkXw7LsnMzS7c9EtHuhtoUQ6MKpmai4dS8GQshI6oezjfzS1zsx07g oOM2D3HtplRlj4u0PMf8sXLsjhXLI9eK0i4CHHfltmoz0QJsYt8awJSLw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:42 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 04/22] sunxi: Hide image type selection if SPL is disabled Date: Tue, 1 Nov 2022 00:08:16 -0500 Message-Id: <20221101050835.2421-5-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This choice is meaningless when SPL is disabled. Hide it to avoid any possible confusion. Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara --- board/sunxi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 084a8b0c6c..42f61df5c5 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,5 +1,6 @@ choice prompt "SPL Image Type" + depends on SPL default SPL_IMAGE_TYPE_SUNXI_EGON config SPL_IMAGE_TYPE_SUNXI_EGON From patchwork Tue Nov 1 05:08:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697622 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=ZD46Na4r; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=WG3KT8Py; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dPJ5fRbz23lC for ; Tue, 1 Nov 2022 16:09:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 73B6B84F65; Tue, 1 Nov 2022 06:08:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="ZD46Na4r"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="WG3KT8Py"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D71B284F41; Tue, 1 Nov 2022 06:08:49 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 626DF84D44 for ; Tue, 1 Nov 2022 06:08:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B35563200927; Tue, 1 Nov 2022 01:08:45 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:08:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279325; x=1667365725; bh=7Z wfitNhBUuL97uqWuZPBGu6YE8zjbxgJzJKnEB4qr4=; b=ZD46Na4rYmgNGMElim Od/S3mq9K9M+47+KBkgxhdDfpXgwbi/lGfWhJgVdlaNmC4e4SeEKwnx9Rb3L2TO3 uQN3MfcpA9/2vvwA4oMJrbY5i4gBddTaHdG4YjKDor5XLV9AXTcfKNnBCJA6I9+K E7Igt3bQMBb7QVxPGbyqQ7tSuhzn0NpzaVJj8cw4OWsNG72lLQMUC2hBCz6M6uZK mVSu60WJ/5jkz5N13DRpVXw046GgDYyP1eIy4QcfvDRxtqG0n/d//pru9Ho6B4D0 b5tV6AJqcaujT9mPKoqeA72JmMJ10tlppsHlLGUhdFu6001yH/rtFK0ZNU0i/euh RFGA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279325; x=1667365725; bh=7ZwfitNhBUuL9 7uqWuZPBGu6YE8zjbxgJzJKnEB4qr4=; b=WG3KT8Pyn3iVl2XhOBr5vcjL85zfX 8r7QYtwvNJUHuhBSXdOOFG5NgIbfreLY4aHE2Pabx4XxQP72I+IuwHuueXq1hIQt d1kx6KRKyswFsD+qUYHzQb9fKCwKcr1ZbzCxweMCWb7RYSSHHtJgolrJ/SBcHgcD eNhiGhkEV2fPDlHj857llvkozvkcw8y6Hu4gUfTUP25qFQUa3YC1ndiVgPFW3naa /vt2SR3H8qp6yfjTgPyfsg7ci+nc+0/850GbSGRsGIsQSgV+6Nfgelt4zjVZrCqD yYCH0hPwSxNTnas4wjBpMENJUQ27dShYO1MMi80tjnEbRNSjj70MCE0BQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:44 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 05/22] sunxi: Share the board Kconfig across architectures Date: Tue, 1 Nov 2022 00:08:17 -0500 Message-Id: <20221101050835.2421-6-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean With the introduction of the Allwinner D1, the sunxi board family now spans multiple architectures (ARM and RISC-V). Since ARCH_SUNXI depends on ARM, it cannot be used to gate architecture-independent options. Specifically, this means the board Kconfig file cannot be sourced from inside the "if ARCH_SUNXI" block. Introduce a new BOARD_SUNXI symbol that can be selected by both ARCH_SUNXI now and the new RISC-V SoC symbols when they are added, and use it to gate the architecture-independent board options. Signed-off-by: Samuel Holland --- arch/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/arm/mach-sunxi/Kconfig | 2 -- board/sunxi/Kconfig | 11 +++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index e3a456a98d..a77192096a 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -458,6 +458,7 @@ source "arch/Kconfig.nxp" endif source "board/keymile/Kconfig" +source "board/sunxi/Kconfig" if MIPS || MICROBLAZE diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4e5daa9e7f..f2852783d4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1134,6 +1134,7 @@ config ARCH_SOCFPGA config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" select BINMAN + select BOARD_SUNXI select CMD_GPIO if GPIO select CMD_MMC if MMC select CMD_USB if DISTRO_DEFAULTS && USB_HOST diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index dbe6005daa..a03e700a0b 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1046,8 +1046,6 @@ config BLUETOOTH_DT_DEVICE_FIXUP The used address is "bdaddr" if set, and "ethaddr" with the LSB flipped elsewise. -source "board/sunxi/Kconfig" - endif config CHIP_DIP_SCAN diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 42f61df5c5..9010631b16 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,3 +1,10 @@ +config BOARD_SUNXI + bool + +if BOARD_SUNXI + +menu "sunxi board options" + choice prompt "SPL Image Type" depends on SPL @@ -23,3 +30,7 @@ config SPL_IMAGE_TYPE string default "sunxi_egon" if SPL_IMAGE_TYPE_SUNXI_EGON default "sunxi_toc0" if SPL_IMAGE_TYPE_SUNXI_TOC0 + +endmenu + +endif From patchwork Tue Nov 1 05:08:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697623 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=K/7wGbyn; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=eVu+DqAZ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dPX6CH6z23l6 for ; Tue, 1 Nov 2022 16:10:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5457984F18; Tue, 1 Nov 2022 06:08:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="K/7wGbyn"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="eVu+DqAZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5CC4684EA8; Tue, 1 Nov 2022 06:08:51 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0B6B284EC7 for ; Tue, 1 Nov 2022 06:08:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 579083200893; Tue, 1 Nov 2022 01:08:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 01 Nov 2022 01:08:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279326; x=1667365726; bh=BP UvxNPBl25Mr4tesTagdqHCLHwE+JaeU3LP34pZc6E=; b=K/7wGbynrHgkg4GtaV p/kEzJk0UaJ6wHkl3fGtNOSDu70/LMkTmlT5M+94DU0asr1Qv1Nyz0udEWTpU0YO 6vyvQ89IdpKM27EWDVxjq6AdVH9FUcTlhyojbhx3ZC0Y1eN9QaVXJxAkwr2DFeRJ jFMNKPafDErLMQaVgn9pgMrz3P0X07jJEZuxiAinDmMfnR2DqLmKHULC64zydooY fFCazAvMe8IODzFMFXIQ+kevBsU9hI5z1kuJImzGBM8vRR9QE8NNUpoE+FcnYRu4 /bpb8xNCe3vZtBaHL+HRUBYJW07OEe1YUDIPFNzrAPBa3hdvM5z4aY7UXGFnoKi2 qDtw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279326; x=1667365726; bh=BPUvxNPBl25Mr 4tesTagdqHCLHwE+JaeU3LP34pZc6E=; b=eVu+DqAZ5Y8R3Mv7gOM6Ykq7ucVg/ 3xyO8dtH3tcv/Dxxz8yrUvFGvdbttALqN882hGV4GDLxKPVtjrpBfbH7gPv6GyUq MLGKA7NW9Iq5y60xec3NGBrDu3eYBqyr6aofSie1qoigTAzBSmevsY14EgpafxRp O/xQTc80fCsHuteR/Roweh/STBnQHo9Sxx+epxPfnw27V8uXxzszWRym5YZ4WyBa Qos1anXQcrLks8V8t2BWfYaI8M2x7nD0dvmp9trEo0nLPXhdMKITxdAZOpZ/d5RZ ydLdZLWrwpmLujsjmjFC/q5GT2Nzl686xdhU4hghctX7H0ESQpLnO8zIQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:46 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 06/22] sunxi: Move most Kconfig selections to the board Kconfig Date: Tue, 1 Nov 2022 00:08:18 -0500 Message-Id: <20221101050835.2421-7-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean To maintain consistent behavior across architectures, most of the options selected by ARCH_SUNXI should be selected for the D1 SoC as well. To accomplish this, select them from BOARD_SUNXI instead. No functional change here. Lines are only moved and alphabetized. Signed-off-by: Samuel Holland --- arch/arm/Kconfig | 46 --------------------------------------------- board/sunxi/Kconfig | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f2852783d4..2c32b419a8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1133,62 +1133,16 @@ config ARCH_SOCFPGA config ARCH_SUNXI bool "Support sunxi (Allwinner) SoCs" - select BINMAN select BOARD_SUNXI - select CMD_GPIO if GPIO - select CMD_MMC if MMC - select CMD_USB if DISTRO_DEFAULTS && USB_HOST - select CLK - select DM - select DM_ETH if NET - select DM_GPIO if GPIO - select DM_I2C if I2C - select DM_SCSI if BLK && SCSI - select DM_SERIAL if SERIAL - select DM_SPI if SPI - select DM_SPI_FLASH if SPI select GPIO_EXTRA_HEADER - select OF_BOARD_SETUP select OF_CONTROL select OF_SEPARATE - select PINCTRL select SPECIFY_CONSOLE_INDEX if SERIAL - select SPL_SEPARATE_BSS if SPL select SPL_STACK_R if SPL select SPL_SYS_MALLOC_SIMPLE if SPL select SPL_SYS_THUMB_BUILD if !ARM64 - select SUNXI_GPIO if GPIO - select SYS_NS16550 if SERIAL select SYS_THUMB_BUILD if !ARM64 - select USB if DISTRO_DEFAULTS - select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST select SPL_USE_TINY_PRINTF - select USE_PREBOOT - select SYS_RELOC_GD_ENV_ADDR - imply BOARD_LATE_INIT - imply CMD_DM - imply CMD_GPT - imply CMD_UBI if MTD_RAW_NAND - imply DISTRO_DEFAULTS - imply FAT_WRITE - imply FIT - imply OF_LIBFDT_OVERLAY - imply PRE_CONSOLE_BUFFER - imply SPL_GPIO - imply SPL_LIBCOMMON_SUPPORT - imply SPL_LIBGENERIC_SUPPORT - imply SPL_MMC if MMC - imply SPL_POWER - imply SPL_SERIAL - imply SYSRESET - imply SYSRESET_WATCHDOG - imply SYSRESET_WATCHDOG_AUTO - imply USB_EHCI_GENERIC - imply USB_EHCI_HCD - imply USB_GADGET - imply USB_OHCI_GENERIC - imply USB_OHCI_HCD - imply WDT config ARCH_U8500 bool "ST-Ericsson U8500 Series" diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 9010631b16..1d0700fe5f 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,5 +1,51 @@ config BOARD_SUNXI bool + select BINMAN + select CLK + select CMD_GPIO if GPIO + select CMD_MMC if MMC + select CMD_USB if DISTRO_DEFAULTS && USB_HOST + select DM + select DM_ETH if NET + select DM_GPIO if GPIO + select DM_I2C if I2C + select DM_SCSI if BLK && SCSI + select DM_SERIAL if SERIAL + select DM_SPI if SPI + select DM_SPI_FLASH if SPI + select OF_BOARD_SETUP + select PINCTRL + select SPL_SEPARATE_BSS if SPL + select SUNXI_GPIO if GPIO + select SYS_NS16550 if SERIAL + select SYS_RELOC_GD_ENV_ADDR + select USB if DISTRO_DEFAULTS + select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST + select USE_PREBOOT + imply BOARD_LATE_INIT + imply CMD_DM + imply CMD_GPT + imply CMD_UBI if MTD_RAW_NAND + imply DISTRO_DEFAULTS + imply FAT_WRITE + imply FIT + imply OF_LIBFDT_OVERLAY + imply PRE_CONSOLE_BUFFER + imply SPL_GPIO + imply SPL_LIBCOMMON_SUPPORT + imply SPL_LIBGENERIC_SUPPORT + imply SPL_MMC if MMC + imply SPL_POWER + imply SPL_SERIAL + imply SYSRESET + imply SYSRESET_WATCHDOG + imply SYSRESET_WATCHDOG_AUTO + imply USB_EHCI_GENERIC + imply USB_EHCI_HCD + imply USB_GADGET + imply USB_OHCI_GENERIC + imply USB_OHCI_HCD + imply WDT if BOARD_SUNXI From patchwork Tue Nov 1 05:08:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697624 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=f/qAzEYx; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=kcV24SjQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dPm39YNz23l6 for ; Tue, 1 Nov 2022 16:10:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AB50984F87; Tue, 1 Nov 2022 06:08:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="f/qAzEYx"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="kcV24SjQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 315E484F50; Tue, 1 Nov 2022 06:08:53 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A32CC84F41 for ; Tue, 1 Nov 2022 06:08:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 023003200907; Tue, 1 Nov 2022 01:08:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 01 Nov 2022 01:08:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279328; x=1667365728; bh=mO wiV7uZbxGfbcHmRyoa5T3baVGMZ4rAL+3rahqA83A=; b=f/qAzEYx8GKpQjefEV 0zMoNETDNyXtHS69I6Mj7VABg+ENySiZihIYGs4G9KkMa71e4ymWi9b+TI/A6FZf l7a4Cem4Vk11xl8STjT5fsH0mkbZKDYPd1BIG54naQuw8aERiEmTUCny54yjjC4N cuLEOnmD0vc+nnoPShvrJ3sGEeBFwO1AoQmO6pw7yIph/whshsZtRe+Bb/HrGPS1 gQERYUN9by2AKgGSZ9bWHJ2vrpfIt0KYUTxt0vPDGXTIq2miOILsRafFz8HjZHn8 xTUC7H/aVzKIdHHM7hJtUlDlG0GyRCO682cL8mTrndeLlezR0Ky7osugRVFZ+kfq ttuQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279328; x=1667365728; bh=mOwiV7uZbxGfb cHmRyoa5T3baVGMZ4rAL+3rahqA83A=; b=kcV24SjQAFC921/RlL0gGK/C1eg9D ZIEASeCgXr+P5Lm2tFcH8Pvgxr94a2xh5cOkWZxTkvCgA5JDcdQyRkLE1n8D0OoM O5G8iyDmRfxkMyTe8LLXClEerWTpMyzim9zhrMRAQsnJ4sABeCtv4bPmVEyqbDLE JNmu1Iot6T85i7S3tNtYbxHlNrZAlQT+lFOj2MjU5bKdeD4CpGRXbjDyfSn1iXLj XCIxwumJE8Rno+xXd3kdAj3fa0D5ZfskjgBnVjRTIFlruRRSCzm/mepRoJXPIeYG lPS16tHoyLauf0GfAKyiehjzBLJXA2ER+6hi/N2x5jqlL1pm+SsRL7QeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:48 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 07/22] sunxi: Globally enable SUPPORT_SPL Date: Tue, 1 Nov 2022 00:08:19 -0500 Message-Id: <20221101050835.2421-8-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This was already supported by every machine type. It is unlikely that any new SoC support will be added without SPL support. Signed-off-by: Samuel Holland --- arch/arm/mach-sunxi/Kconfig | 14 -------------- board/sunxi/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index a03e700a0b..73097e5a40 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -133,7 +133,6 @@ config SUN50I_GEN_H6 select FIT select SPL_LOAD_FIT select MMC_SUNXI_HAS_NEW_MODE - select SUPPORT_SPL ---help--- Select this for sunxi SoCs which have H6 like peripherals, clocks and memory map. @@ -167,7 +166,6 @@ config MACH_SUNXI_H3_H5 select SUNXI_DRAM_DW select SUNXI_DRAM_DW_32BIT select SUNXI_GEN_SUN6I - select SUPPORT_SPL # TODO: try out A80's 8GiB DRAM space config SUNXI_DRAM_MAX_SIZE @@ -184,7 +182,6 @@ config MACH_SUNIV bool "suniv (Allwinner F1C100s/F1C200s/F1C600/R6)" select CPU_ARM926EJS select SUNXI_GEN_SUN6I - select SUPPORT_SPL select SKIP_LOWLEVEL_INIT_ONLY select SPL_SKIP_LOWLEVEL_INIT_ONLY @@ -194,7 +191,6 @@ config MACH_SUN4I select PHY_SUN4I_USB select DRAM_SUN4I select SUNXI_GEN_SUN4I - select SUPPORT_SPL imply SPL_SYS_I2C_LEGACY imply SYS_I2C_LEGACY @@ -204,7 +200,6 @@ config MACH_SUN5I select DRAM_SUN4I select PHY_SUN4I_USB select SUNXI_GEN_SUN4I - select SUPPORT_SPL imply SPL_SYS_I2C_LEGACY imply SYS_I2C_LEGACY @@ -220,7 +215,6 @@ config MACH_SUN6I select SPL_I2C select SUN6I_PRCM select SUNXI_GEN_SUN6I - select SUPPORT_SPL select SYS_I2C_SUN6I_P2WI select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT @@ -234,7 +228,6 @@ config MACH_SUN7I select DRAM_SUN4I select PHY_SUN4I_USB select SUNXI_GEN_SUN4I - select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT imply SPL_SYS_I2C_LEGACY imply SYS_I2C_LEGACY @@ -249,7 +242,6 @@ config MACH_SUN8I_A23 select PHY_SUN4I_USB select SPL_I2C select SUNXI_GEN_SUN6I - select SUPPORT_SPL select SYS_I2C_SUN8I_RSB select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT @@ -263,7 +255,6 @@ config MACH_SUN8I_A33 select PHY_SUN4I_USB select SPL_I2C select SUNXI_GEN_SUN6I - select SUPPORT_SPL select SYS_I2C_SUN8I_RSB select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT @@ -276,7 +267,6 @@ config MACH_SUN8I_A83T select SUNXI_GEN_SUN6I select MMC_SUNXI_HAS_NEW_MODE select MMC_SUNXI_HAS_MODE_SWITCH - select SUPPORT_SPL select SYS_I2C_SUN8I_RSB config MACH_SUN8I_H3 @@ -296,7 +286,6 @@ config MACH_SUN8I_R40 select ARCH_SUPPORT_PSCI select SUNXI_GEN_SUN6I select MMC_SUNXI_HAS_NEW_MODE - select SUPPORT_SPL select SUNXI_DRAM_DW select SUNXI_DRAM_DW_32BIT select PHY_SUN4I_USB @@ -311,7 +300,6 @@ config MACH_SUN8I_V3S select SUNXI_GEN_SUN6I select SUNXI_DRAM_DW select SUNXI_DRAM_DW_16BIT - select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT config MACH_SUN9I @@ -322,7 +310,6 @@ config MACH_SUN9I select SPL_I2C select SUN6I_PRCM select SUNXI_GEN_SUN6I - select SUPPORT_SPL config MACH_SUN50I bool "sun50i (Allwinner A64)" @@ -332,7 +319,6 @@ config MACH_SUN50I select SUNXI_DE2 select SUNXI_GEN_SUN6I select MMC_SUNXI_HAS_NEW_MODE - select SUPPORT_SPL select SUNXI_DRAM_DW select SUNXI_DRAM_DW_32BIT select FIT diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 1d0700fe5f..056ccb6f74 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -18,6 +18,7 @@ config BOARD_SUNXI select SPL_SEPARATE_BSS if SPL select SUNXI_GPIO if GPIO select SYS_NS16550 if SERIAL + select SUPPORT_SPL select SYS_RELOC_GD_ENV_ADDR select USB if DISTRO_DEFAULTS select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST @@ -31,6 +32,7 @@ config BOARD_SUNXI imply FIT imply OF_LIBFDT_OVERLAY imply PRE_CONSOLE_BUFFER + imply SPL imply SPL_GPIO imply SPL_LIBCOMMON_SUPPORT imply SPL_LIBGENERIC_SUPPORT From patchwork Tue Nov 1 05:08:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697625 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=DqpMeyrf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=LfxNDLUj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dPy4c8sz23l6 for ; Tue, 1 Nov 2022 16:10:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E63E28500B; Tue, 1 Nov 2022 06:08:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="DqpMeyrf"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="LfxNDLUj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ABE8C84F41; Tue, 1 Nov 2022 06:08:54 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4F7FF84EEF for ; Tue, 1 Nov 2022 06:08:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 9FC323200893; Tue, 1 Nov 2022 01:08:50 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 01 Nov 2022 01:08:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279330; x=1667365730; bh=as 54Prjy0q90aLhRFdj+mgq0qy+q/qpzTvobw1CGNV4=; b=DqpMeyrfa8odmmFFzl wWVyd8KEdwk+P/mek2FiD9aR1dKzO/zPJA0ngZgTmTmxxC8Lw4g7i8LxMypwjQi9 Na18ZebReNwUhCkAXJriqfGPtyehAhVEfBg+D8EhoqDt/9iJ+wMzSwdbFNs2k8LI GtiXbxwuIXgo1ZCZFRQJQGwvBD5vJipt1hKNSptCiwiO8a1eHX7XenDvsGviNpAa UOhR4d1N6k1LdRcqGwwJgu6g1kameYIGRx/Vzc+NROgmR8FGnst7H1emR2mnDvx/ c+UIFxk3td/ywzxfKm0accQ+ThIYc5eUkRZTzq435VdwdZKhVy8CkcC7dI3wkuKc lpdw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279330; x=1667365730; bh=as54Prjy0q90a LhRFdj+mgq0qy+q/qpzTvobw1CGNV4=; b=LfxNDLUjkjrzKwxjU3bMnrSeaHKKB 5QPoths5WE8qjL7dKWmG2gHCeFIuLzU/MrqjEwoAk3gH/bhhm/KhuJZv+nr3W6DH 5CqGpP8+4O0nfzZtulgsePQi7oXDrxkDz6OE8NPPQHY5TwKdpPWvlxWYTBgWLyrj Fn2oNqijS7Jhysr6BzpxRJJcj7aj3luFofpwMbbM4a/MfJ53pntQJQ+zDiEkGRsu CwxAU17oVGRxk2t0lIgIGIHu8QZT8xjaPCAmhD/YqokfhxVGqDt5shr6mlTep6zO vQcItjsc/Hrd49kPIamCGBewpDYNoG5z9a1/Vd+P/tcdhwPZ2LR6PWqLQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:49 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 08/22] sunxi: Downgrade driver selections to implications Date: Tue, 1 Nov 2022 00:08:20 -0500 Message-Id: <20221101050835.2421-9-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean While not especially likely, it is plausible that someone wants to build U-Boot without GPIO or UART support. Don't force building these drivers. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 056ccb6f74..b301ba998e 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -16,8 +16,6 @@ config BOARD_SUNXI select OF_BOARD_SETUP select PINCTRL select SPL_SEPARATE_BSS if SPL - select SUNXI_GPIO if GPIO - select SYS_NS16550 if SERIAL select SUPPORT_SPL select SYS_RELOC_GD_ENV_ADDR select USB if DISTRO_DEFAULTS @@ -39,6 +37,8 @@ config BOARD_SUNXI imply SPL_MMC if MMC imply SPL_POWER imply SPL_SERIAL + imply SUNXI_GPIO + imply SYS_NS16550 imply SYSRESET imply SYSRESET_WATCHDOG imply SYSRESET_WATCHDOG_AUTO From patchwork Tue Nov 1 05:08:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697626 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=NfjSzZ5g; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=WcIiWg//; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dQ96ZDQz23l6 for ; Tue, 1 Nov 2022 16:10:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAFDF8502C; Tue, 1 Nov 2022 06:08:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="NfjSzZ5g"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="WcIiWg//"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D395284F99; Tue, 1 Nov 2022 06:08:56 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9318984EC7 for ; Tue, 1 Nov 2022 06:08:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 59D803200931; Tue, 1 Nov 2022 01:08:52 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 01 Nov 2022 01:08:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279331; x=1667365731; bh=JI yML1jRCRgXadFR7W32wSTp9AwIBsE8TvE5FzU3a9Q=; b=NfjSzZ5g25LhBoQSWT 3xhn8ORIXLHHt9a64leGJZYHRfC7KEtFaHSeSerw19ScGp02yuJvoboU9OIFFMI0 jmzsoPbnpv39o24O3XltfT51gWRiGLbDqHAjG98Ru1vx0eQrx/SWUtxlZdMIIjrB mE3jXNPXwMe15G6SGWoYjDqBZkBCC/BkVFECi5E+mHl3nhTyAZKJmgLK5coVKm9o uLCHIT0IlLnEsa6PhOV0AlQChLRe0n6p+/0rLV7svWdJOYOFJN1bn7oxTQodP6GM ikTA/S0aF+yVQAtVz6roFAQxx7WutX7EiFHoDKt+UK5eMLjlmvLq4fDxhTCE1diP UteQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279331; x=1667365731; bh=JIyML1jRCRgXa dFR7W32wSTp9AwIBsE8TvE5FzU3a9Q=; b=WcIiWg//ksi1LPVLrgMQR3bShgwJ2 GfkX/+8YvHS2IWHkxttenb274RZt+71w6fVMQ+iUkhEFLeM6uKEPtL1i9Rv/mSor K0zx7/TKfsuSPvAQa9av263JF17iaMIg3eD6PUMq2+imYtXuSU7CBQPtZeOPFFIn BiTqbuf/EDgEUFhitvLeqUiTU8RmBX//PT7+/r8E4KpnEHXQUYKLGAisqcIgxAF5 vgZQ6/H4ErlRmxMGXTXzCYodi9F64Z3Y5iwaChfwQnvWMP5iu7QFuQWNhaDFTbld NfqfUbDCa/Yb7j6ielK58GZfj+bSWSGCkJq3FkPhJZ8ldsoIiktlDwiRA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:51 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 09/22] sunxi: Enable the I2C driver by default Date: Tue, 1 Nov 2022 00:08:21 -0500 Message-Id: <20221101050835.2421-10-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This is used by quite a large number of boards, for PMIC/regulator or LCD panel control. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index b301ba998e..809cd17f54 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -38,6 +38,7 @@ config BOARD_SUNXI imply SPL_POWER imply SPL_SERIAL imply SUNXI_GPIO + imply SYS_I2C_MVTWSI imply SYS_NS16550 imply SYSRESET imply SYSRESET_WATCHDOG From patchwork Tue Nov 1 05:08:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697627 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=oH8Dp4cK; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=QRiKbvdn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dQN1JWKz23l6 for ; Tue, 1 Nov 2022 16:10:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE35284F99; Tue, 1 Nov 2022 06:09:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="oH8Dp4cK"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="QRiKbvdn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 49A8485038; Tue, 1 Nov 2022 06:08:59 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C7DCA84F54 for ; Tue, 1 Nov 2022 06:08:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 179FD3200907; Tue, 1 Nov 2022 01:08:54 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 01 Nov 2022 01:08:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279333; x=1667365733; bh=/F D0+eDLu5+JGSBxZSMjAxNhcJQZsOHQivmpTSG8gz8=; b=oH8Dp4cKsoKK9choWO /idewnlQWgGo4k6CU/GLUD5oJJYaswmcnkrQVx/NNgSa0Ncil5gJb6JjgLhjXaes CMASp1wx9rA3KmkyCwlK7Js6KLogOrk5N2RassicdE1DD3cJ7hQRqiG1qJ91BORo hboBZuoh54SKgPPC3W3eoHwo+JZTwYihVcxb8+X+Pb8mshAviOwqvVkoSY71k031 8dJlcafweAexIzIchwsNRd17AIL9HkD/B2RW+al6B1WnEtEWcSBBEj6kZa6oMEjL sOKQJUsYyJxub6jYLigb9Z9f8Fuo7gk98yPSjVRxaPPZjePdIRoCUu017ByOyXji ngGA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279333; x=1667365733; bh=/FD0+eDLu5+JG SBxZSMjAxNhcJQZsOHQivmpTSG8gz8=; b=QRiKbvdn6ld8sr9RaJ+rlQjUsRECG NlZrulKoJ6vJEKzS2xeEb5l4qidqM0uiKAz/LbuW4WHYZoweC/ewIjCDEOI9oxcY Oc7Lrt+baoWW4ivn4U0M/8aB3KV/cimCtYPUWKcJXjYObBte41yCdpOVJun8Rd99 60n3XovrhcUoEEaBFzj9K0WN43aAM1oLd0OZW7YTEJfRg4QtNkIZFEpQcxFleiQG 2P4sI3lF6k+pt6e6F1adqvR8flDgbpWjQ+kfoy0zO1wEth5xlRVijOQ9xYjLdWTm yaTlaONixIEZobdoFBGBjpHcIxeyBOOuQkBAUvIk5nR5JshYLvVcIuJDA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:53 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 10/22] sunxi: Move default values to the board Kconfig Date: Tue, 1 Nov 2022 00:08:22 -0500 Message-Id: <20221101050835.2421-11-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This keeps all of the defaults for sunxi platforms in one place. Most of these only depend on architecture-independent features of the SoC (clock tree or SRAM layout) anyway. No functional change; just some minor help text cleanup. Signed-off-by: Samuel Holland --- arch/arm/mach-sunxi/Kconfig | 67 ------------------------------------ board/sunxi/Kconfig | 68 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 73097e5a40..24840f6d7e 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1,8 +1,5 @@ if ARCH_SUNXI -config IDENT_STRING - default " Allwinner Technology" - config DRAM_SUN4I bool help @@ -99,17 +96,6 @@ config AXP_PMIC_BUS Select this PMIC bus access helpers for Sunxi platform PRCM or other AXP family PMIC devices. -config SUNXI_SRAM_ADDRESS - hex - default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 - default 0x20000 if SUN50I_GEN_H6 - default 0x0 - ---help--- - Older Allwinner SoCs have their mask boot ROM mapped just below 4GB, - with the first SRAM region being located at address 0. - Some newer SoCs map the boot ROM at address 0 instead and move the - SRAM to a different address. - config SUNXI_A64_TIMER_ERRATUM bool @@ -573,48 +559,6 @@ config DRAM_ODT_CORRECTION then the correction is negative. Usually the value for this is 0. endif -config SYS_CLK_FREQ - default 408000000 if MACH_SUNIV - default 1008000000 if MACH_SUN4I - default 1008000000 if MACH_SUN5I - default 1008000000 if MACH_SUN6I - default 912000000 if MACH_SUN7I - default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 - default 1008000000 if MACH_SUN8I - default 1008000000 if MACH_SUN9I - default 888000000 if MACH_SUN50I_H6 - default 1008000000 if MACH_SUN50I_H616 - -config SYS_CONFIG_NAME - default "suniv" if MACH_SUNIV - default "sun4i" if MACH_SUN4I - default "sun5i" if MACH_SUN5I - default "sun6i" if MACH_SUN6I - default "sun7i" if MACH_SUN7I - default "sun8i" if MACH_SUN8I - default "sun9i" if MACH_SUN9I - default "sun50i" if MACH_SUN50I - default "sun50i" if MACH_SUN50I_H6 - default "sun50i" if MACH_SUN50I_H616 - -config SYS_BOARD - default "sunxi" - -config SYS_SOC - default "sunxi" - -config SUNXI_MINIMUM_DRAM_MB - int "minimum DRAM size" - default 32 if MACH_SUNIV - default 64 if MACH_SUN8I_V3S - default 256 - ---help--- - Minimum DRAM size expected on the board. Traditionally we assumed - 256 MB, so that U-Boot would load at 160MB. With co-packaged DRAM - we have smaller sizes, though, so that U-Boot's own load address and - the default payload addresses must be shifted down. - This is expected to be fixed by the SoC selection. - config UART0_PORT_F bool "UART0 on MicroSD breakout board" ---help--- @@ -985,17 +929,6 @@ config GMAC_TX_DELAY ---help--- Set the GMAC Transmit Clock Delay Chain value. -config SPL_STACK_R_ADDR - default 0x81e00000 if MACH_SUNIV - default 0x4fe00000 if MACH_SUN4I - default 0x4fe00000 if MACH_SUN5I - default 0x4fe00000 if MACH_SUN6I - default 0x4fe00000 if MACH_SUN7I - default 0x4fe00000 if MACH_SUN8I - default 0x2fe00000 if MACH_SUN9I - default 0x4fe00000 if MACH_SUN50I - default 0x4fe00000 if SUN50I_GEN_H6 - config SPL_SPI_SUNXI bool "Support for SPI Flash on Allwinner SoCs in SPL" depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUNXI_H3_H5 || MACH_SUN50I || MACH_SUN8I_R40 || SUN50I_GEN_H6 || MACH_SUNIV diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 809cd17f54..105c902036 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -52,6 +52,74 @@ config BOARD_SUNXI if BOARD_SUNXI +config IDENT_STRING + default " Allwinner Technology" + +config SPL_STACK_R_ADDR + default 0x81e00000 if MACH_SUNIV + default 0x4fe00000 if MACH_SUN4I + default 0x4fe00000 if MACH_SUN5I + default 0x4fe00000 if MACH_SUN6I + default 0x4fe00000 if MACH_SUN7I + default 0x4fe00000 if MACH_SUN8I + default 0x2fe00000 if MACH_SUN9I + default 0x4fe00000 if MACH_SUN50I + default 0x4fe00000 if SUN50I_GEN_H6 + +config SUNXI_MINIMUM_DRAM_MB + int "minimum DRAM size" + default 32 if MACH_SUNIV + default 64 if MACH_SUN8I_V3S + default 256 + help + Minimum DRAM size expected on the board. Traditionally we + assumed 256 MB, so that U-Boot would load at 160MB. With + co-packaged DRAM we have smaller sizes, though, so U-Boot's + own load address and the default payload addresses must be + shifted down. This is expected to be fixed by the SoC + selection. + +config SUNXI_SRAM_ADDRESS + hex + default 0x10000 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 + default 0x20000 if SUN50I_GEN_H6 + default 0x0 + help + Older Allwinner SoCs have their boot mask ROM mapped just + below 4GB, with the first SRAM region located at address 0. + Newer SoCs map the boot ROM at address 0 instead and move the + SRAM to a different address. + +config SYS_BOARD + default "sunxi" + +config SYS_CLK_FREQ + default 408000000 if MACH_SUNIV + default 1008000000 if MACH_SUN4I + default 1008000000 if MACH_SUN5I + default 1008000000 if MACH_SUN6I + default 912000000 if MACH_SUN7I + default 1008000000 if MACH_SUN8I + default 1008000000 if MACH_SUN9I + default 816000000 if MACH_SUN50I || MACH_SUN50I_H5 + default 888000000 if MACH_SUN50I_H6 + default 1008000000 if MACH_SUN50I_H616 + +config SYS_CONFIG_NAME + default "suniv" if MACH_SUNIV + default "sun4i" if MACH_SUN4I + default "sun5i" if MACH_SUN5I + default "sun6i" if MACH_SUN6I + default "sun7i" if MACH_SUN7I + default "sun8i" if MACH_SUN8I + default "sun9i" if MACH_SUN9I + default "sun50i" if MACH_SUN50I + default "sun50i" if MACH_SUN50I_H6 + default "sun50i" if MACH_SUN50I_H616 + +config SYS_SOC + default "sunxi" + menu "sunxi board options" choice From patchwork Tue Nov 1 05:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697628 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=lMfHBEzC; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=W/r3Vr8m; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dQb2mVnz23l6 for ; Tue, 1 Nov 2022 16:11:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 949EA8504C; Tue, 1 Nov 2022 06:09:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="lMfHBEzC"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="W/r3Vr8m"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9A6EE84F84; Tue, 1 Nov 2022 06:08:59 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6C29184F99 for ; Tue, 1 Nov 2022 06:08:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id BFA1E3200437; Tue, 1 Nov 2022 01:08:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:08:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279335; x=1667365735; bh=od fayNx4i9Jkiu66pHDjf+Op2Ov4cD/PxnIBg7X3N90=; b=lMfHBEzC9U7S0OCJpM PaiGUm/LOC/1GD9CUe3KyrlV/9rWtLvgU8BWrwVr3LW6gvxrpYzvbkO4968mmnNS HFG8vQUEx/Yz5Z1HkH+gUDjMQmDhS96kZjTDcpwQwSP8aiOf4a6ZtWOrY2Gxa4X3 n5OG4wdLC5cDCfmgbUuhb9mlM87lC6Z5ns6HVlC3T8hXuK6+dIQum00snGqn3Fo8 qW1EAnviAsKjThdgMEu+WBVQCSyV7H/WlOhXz/ALRwZE8Me+QcFC2Q9SCtQdX/dt wPbjGpWEax9PqI70f4lNbqOuxEsigiH7g+Rd2O5Fi7adGHajxNDKSiwVqva4tW+t NtsA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279335; x=1667365735; bh=odfayNx4i9Jki u66pHDjf+Op2Ov4cD/PxnIBg7X3N90=; b=W/r3Vr8mcXS5MjSoSGYyXae4fwI+3 cPqstOxo3iVvMwWYv0MTynqN8ubhDk5qoigI3eIWIFYaUxi7/VKyWKccvngKyyyl mJ7ilr0GKHxhnb96ntcjUNAhe2S1pwFU0NB1De98aSX1mnIum2fPx3Kv4ppPe3i7 QVwmQK4O3wpiFL+l4G8ocxr0WPPNVEhIifyHQXRys5cHtoMtUyzFI9ENtiDXWxiD GbIKxwMpfJ+dHLO34w+47K09cCnm+4D20QN0S34GuUtjt+m/6vePlqg+zyfp2nFZ FemZrBoNuq+3DS+/Alm+yq+fULXNft/EXv6FaH+8g5hNxtHM9daLUAVSA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:54 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 11/22] sunxi: Hide the SUNXI_MINIMUM_DRAM_MB symbol Date: Tue, 1 Nov 2022 00:08:23 -0500 Message-Id: <20221101050835.2421-12-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This option affects the ABI between SPL/U-Boot and U-Boot/scripts, so it should not normally be changed by the user. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 105c902036..d686d84170 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -67,7 +67,7 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if SUN50I_GEN_H6 config SUNXI_MINIMUM_DRAM_MB - int "minimum DRAM size" + int default 32 if MACH_SUNIV default 64 if MACH_SUN8I_V3S default 256 From patchwork Tue Nov 1 05:08:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697629 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=sIsfJ40S; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=cQ6/IJRS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dQn5HC3z23l6 for ; Tue, 1 Nov 2022 16:11:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A512D850A1; Tue, 1 Nov 2022 06:09:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="sIsfJ40S"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="cQ6/IJRS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB5F984F84; Tue, 1 Nov 2022 06:09:04 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0478385035 for ; Tue, 1 Nov 2022 06:08:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 507CD3200922; Tue, 1 Nov 2022 01:08:57 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 01 Nov 2022 01:08:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279336; x=1667365736; bh=9B pktKMEVnhig40T3ezuUhGdv5rHFB3LaykGLqIq+4Q=; b=sIsfJ40SvnsWrrzugM RTopDqw5cddOji1k6zDhf9tUj+XnGRNSTJ7LAz+/ip+ptHS3QeUEjXM4W5aAwA8W NHQ9dolGXPV/2Dc1tbVUIxEAa0ps1EhyQ00FCWMRNRgcCwUKutOQUeaEHnv6DkYZ Dl89H9rYVXGQnXGkWe3sdGvxHPgfwxkPDZxzZlmFqWGfBT++DlGKH0c+R3IM2iJs +v5XUuaH5Ki6Jr69xQ7+rTbZPQ9QqPxjnCBBgj6LM2+plI09m4hA4Rt+Z+fr0DJ+ zdGgADeQAe1KN0OEDL/6DqdRaSwm18hboNZftBm/osCsYTnPBu+IJojF2Awr+s3q EjQg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279336; x=1667365736; bh=9BpktKMEVnhig 40T3ezuUhGdv5rHFB3LaykGLqIq+4Q=; b=cQ6/IJRSE0Shpgbd/tTvSGYAJbzpT Ze3RT+d9uYhZPbm8GLozhg5Fizs8iK1jQmVrny82UEQIAUlqkkqjgrPNxLCJbPnK QAwcywBprQLH67iYYjJrWJRYQlFEW5nMWc4WKptMgcMfG9dDppdIqi8rGAsFCuOm R6u4zXUPvQc6dLv2qoQCXG1icfXbEUZJPuTwUW3HCzKoiMqeNKttL61ck63tgBv3 A0F3lwLc1+xJGVFTUTavwms0EK3kureLD7aZ54wxRTK2RJbHARIWA6CxUmoQPFlk 33/AwWyQgNkkje7TL8rZtmO5RedX6BGdSE0Zr66R22/FWoi5dpOvvPD+Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:56 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 12/22] sunxi: Clean up the SPL_STACK_R_ADDR defaults Date: Tue, 1 Nov 2022 00:08:24 -0500 Message-Id: <20221101050835.2421-13-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean Update this option to be based on SUNXI_MINIMUM_DRAM_MB. This corrects the value used on V3s, which previously was the MACH_SUN8I default, and so relied on addresses wrapping modulo the DRAM size. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index d686d84170..7d678108a0 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -57,14 +57,9 @@ config IDENT_STRING config SPL_STACK_R_ADDR default 0x81e00000 if MACH_SUNIV - default 0x4fe00000 if MACH_SUN4I - default 0x4fe00000 if MACH_SUN5I - default 0x4fe00000 if MACH_SUN6I - default 0x4fe00000 if MACH_SUN7I - default 0x4fe00000 if MACH_SUN8I default 0x2fe00000 if MACH_SUN9I - default 0x4fe00000 if MACH_SUN50I - default 0x4fe00000 if SUN50I_GEN_H6 + default 0x4fe00000 if SUNXI_MINIMUM_DRAM_MB >= 256 + default 0x43e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 config SUNXI_MINIMUM_DRAM_MB int From patchwork Tue Nov 1 05:08:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697630 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=ZdeCPDdo; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=r+1PJXS1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dR01B7rz23l6 for ; Tue, 1 Nov 2022 16:11:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7FA03850A6; Tue, 1 Nov 2022 06:09:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="ZdeCPDdo"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="r+1PJXS1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72AA485037; Tue, 1 Nov 2022 06:09:05 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8803784F49 for ; Tue, 1 Nov 2022 06:09:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id DB5923200893; Tue, 1 Nov 2022 01:08:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:08:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279338; x=1667365738; bh=Je N7oSuyUfwZNRipdKsMmjMLZK3AmzHtyzuPg+zX7FY=; b=ZdeCPDdo7PcxPEzYPf 2XLMkINKWrGu8xL9Oh1XFkdoNiaJ08eQ92Jh06tj1V8SHrFu53QwqBLXeWoD9IXT soYm2+PlW+9Nxlbh8hD82GU96Tymx0NhRvkueqbr6zp+B+xTCEF3+DdCPxexRbRc lvpMTXVoO57fX+Om5Rowm6HBjeo5qNhNqsvkmo724PQS7X8+ZbKEtr6W3wk5B1aR UCPuMTYT72+TdcwT9Pb+egWhLTbZEgQvN2PF7ZsMe0L0yNM5brzRSCYMNJhiRCkg F1jrKpsV3TySPMEnxAaVr5WKImGbxSM4/KEWtX8NpNqXBDox3kb08dWmn/oisNGg KQHQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279338; x=1667365738; bh=JeN7oSuyUfwZN RipdKsMmjMLZK3AmzHtyzuPg+zX7FY=; b=r+1PJXS1Q/izPRKgWkzUuoNE/sORl Wxd0VT9ndygjzu3tLoaKIprV+1mmyUyzUlz5aBVqrLmmNqJ3qez3jt9C5DrHWNfV nPwjMM4MtXcsEQ9BYBSQ29rNWqj4GXcrPKscvBD+d4s/mjVmCrLomPntovyNhih+ iQ6vyl4G9j177h/g1fw1QOWlrRTZnx+ueWXYPbqgdaXcTq8WvoGSiRhxowLBHSd2 tc9U8bDKeCvoys1n6ux4K50z3bcdLakZW2AIQzaYcy/180GSPv7/H+HglwCrm8wb PB1rU//YHd3QqJ0dPlPji8in+51hf1BPYbnuIOQ5h/LPWFb7Oqr2X+f/Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:58 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 13/22] sunxi: Move PRE_CON_BUF_ADDR to the board Kconfig Date: Tue, 1 Nov 2022 00:08:25 -0500 Message-Id: <20221101050835.2421-14-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This provides a default value for RISC-V when that is added, and it makes sense to put this option next to the other DRAM layout options. While at it, provide sensible values for platforms with less DRAM. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 6 ++++++ common/Kconfig | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 7d678108a0..704535d467 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -55,6 +55,12 @@ if BOARD_SUNXI config IDENT_STRING default " Allwinner Technology" +config PRE_CON_BUF_ADDR + default 0x81000000 if MACH_SUNIV + default 0x2f000000 if MACH_SUN9I + default 0x4f000000 if SUNXI_MINIMUM_DRAM_MB >= 256 + default 0x43000000 if SUNXI_MINIMUM_DRAM_MB >= 64 + config SPL_STACK_R_ADDR default 0x81e00000 if MACH_SUNIV default 0x2fe00000 if MACH_SUN9I diff --git a/common/Kconfig b/common/Kconfig index 21434c5cf1..bc2c078d4a 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -195,8 +195,6 @@ config PRE_CON_BUF_SZ config PRE_CON_BUF_ADDR hex "Address of the pre-console buffer" depends on PRE_CONSOLE_BUFFER - default 0x2f000000 if ARCH_SUNXI && MACH_SUN9I - default 0x4f000000 if ARCH_SUNXI && !MACH_SUN9I default 0x0f000000 if ROCKCHIP_RK3288 default 0x0f200000 if ROCKCHIP_RK3399 help From patchwork Tue Nov 1 05:08:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697631 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=I5iU3+vM; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=ZTXwTJ7x; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dRB4PsLz23l6 for ; Tue, 1 Nov 2022 16:11:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EDD9C85043; Tue, 1 Nov 2022 06:09:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="I5iU3+vM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="ZTXwTJ7x"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F06785037; Tue, 1 Nov 2022 06:09:11 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2F0CA8502B for ; Tue, 1 Nov 2022 06:09:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 7EB0E3200932; Tue, 1 Nov 2022 01:09:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 01 Nov 2022 01:09:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279340; x=1667365740; bh=sD 6Ha5wzLDfVEZZhnL+EGkij/RnYy7BrZpmy3Ma3n/k=; b=I5iU3+vMCml8kJuEY1 Oyjfaig740adfggeEgMq2ZgvBfHurhL5GVZv3kyzxoeRJ+ITtMhKfsQ1aMNaXhMt 019XgzWyI0PGuGHQ/gd0NNjLM5WxZWTn1Uh/pm+QgPJw7Dj8IY+t8QRJAn+OA295 vZQQLcqRxQM8M21Nyk7Q2SjcImqzVVgsHpgFTCBUhaLsGkdVdO7UYN0Kiz1OvqbB 493XzD0A3OIIv4Xig16E0uxzw+t1VsC1EfOmwP2FQzTbmbMe8IXviU/YoKWUhJBI LXNAGnQg6ZVE+8Q3JbttsRVXOs1B4eQRZRsbkGy8xzP68ZwoR7h8Mx6gZvIf/KqA 7J/Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279340; x=1667365740; bh=sD6Ha5wzLDfVE ZZhnL+EGkij/RnYy7BrZpmy3Ma3n/k=; b=ZTXwTJ7xjA2dtHysFus8LEv19tDpT I4GIgvfnL6ammbgetEzLK1nsmXoWyrHE5FyUrSlRcwQi2BCpHDXTlJTSVMGoJP4X d/NPmSR3Qgk6V883UGDaOjw4ZCKU8faJCMtaHbrBc5zjV9G+fJ3uHGlgVFkVYuog zVB2jRy+ymCAgqxySBGCNnbshY9uHt8SpjufI9DZMbHLR8UrfbNlhInpRY/R8+y6 VooGkI5INKxkPg4A/E/IyF/uttL6RYeUSKomz0Hz4CWpDA6+lNlC9CPUY+fDah69 EvFPM/a0CZP8ZNs+FSoHdGk1xD2TXDQsiC48HyTJuXlnVffNWjKBnJLZg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:08:59 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 14/22] sunxi: Move SPL_BSS_START_ADDR to the board Kconfig Date: Tue, 1 Nov 2022 00:08:26 -0500 Message-Id: <20221101050835.2421-15-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This provides a default value for RISC-V when that is added, and it makes sense to put this option next to the other DRAM layout options. While at it, provide sensible values for platforms with less DRAM. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 6 ++++++ common/spl/Kconfig | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 704535d467..1abb3e1816 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -61,6 +61,12 @@ config PRE_CON_BUF_ADDR default 0x4f000000 if SUNXI_MINIMUM_DRAM_MB >= 256 default 0x43000000 if SUNXI_MINIMUM_DRAM_MB >= 64 +config SPL_BSS_START_ADDR + default 0x81f80000 if MACH_SUNIV + default 0x2ff80000 if MACH_SUN9I + default 0x4ff80000 if SUNXI_MINIMUM_DRAM_MB >= 256 + default 0x43f80000 if SUNXI_MINIMUM_DRAM_MB >= 64 + config SPL_STACK_R_ADDR default 0x81e00000 if MACH_SUNIV default 0x2fe00000 if MACH_SUN9I diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b738c749ff..b1e9926e68 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -118,9 +118,6 @@ config SPL_BSS_START_ADDR default 0x88200000 if (ARCH_MX6 && (MX6SX || MX6SL || MX6UL || MX6ULL)) || ARCH_MX7 default 0x18200000 if ARCH_MX6 && !(MX6SX || MX6SL || MX6UL || MX6ULL) default 0x80a00000 if ARCH_OMAP2PLUS - default 0x81f80000 if ARCH_SUNXI && MACH_SUNIV - default 0x4ff80000 if ARCH_SUNXI && !(MACH_SUN9I || MACH_SUNIV) - default 0x2ff80000 if ARCH_SUNXI && MACH_SUN9I default 0x1000 if ARCH_ZYNQMP choice From patchwork Tue Nov 1 05:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697633 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=kZpSxz10; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=ll/Tqlq8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dRZ5z2Sz23l6 for ; Tue, 1 Nov 2022 16:11:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8701685091; Tue, 1 Nov 2022 06:09:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="kZpSxz10"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="ll/Tqlq8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2FF37850A6; Tue, 1 Nov 2022 06:09:14 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E10CE85042 for ; Tue, 1 Nov 2022 06:09:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id EE4E23200936; Tue, 1 Nov 2022 01:09:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:09:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279341; x=1667365741; bh=SS Yz9EIsjWglrIJteb16h866//x/DZs9BeljxakkPwA=; b=kZpSxz10fu3+S8hEvK FyHIK2A77R3eUfNS5QjKBsXf4SU6p1m/p+nr3d9R2oakVqDxVZU+YewrmAZHiW9t yrfeRgpnjWUeFYlvK21Zz8dPAzoLoOrZiyXCkFDwlXGhqISnubTwL/aKboafHyi3 t2jkPVV4RsnQy0umaDqzQp/nRyIuUPhiyqTe0vqHzoDF3uJ5d7F/R4PS4l00L80H sPwx2OXWolaooSOui3AXypA0IiLCQBC+OsSTiZ7f/c5uPhEGXJmcKEG45x8NODzS Z5epiMFpRIz8sdipq0gllWpa9uRWJqwg8AFS4fEiz5ZJ8aoDV6J27xcGB2tygCVK i4/g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279341; x=1667365741; bh=SSYz9EIsjWglr IJteb16h866//x/DZs9BeljxakkPwA=; b=ll/Tqlq84SJ4EhNq2n2sxbDyHKX3L REqHhSlLJzMBKJyi6CorvmJARAUxCRBaanTjTltsMixlu7gC17BuUO0BcPZn2sD4 x1giJIR7e2XqLZkz6wnsN2RnQaLt08TqvQCl4AP6qYo5EuWmZys14B8EhMe/YUVh ZKQL5H81ytefpEPBoqrYFT4zbL6TgpNU/kALxdeXtIr9rBL7J05iuOJWcmJq86Tn tA8vNgN6od/EDY/CAwOcGsD7W1ybZLWdzkvpanchszqrn0VZMeXSLXCKNfWKnnUX sl1zUeaSDpuYAwCncm+uVXsWnynLqLyyWqq5q9a7EyxtYUGdUjp8jZOcQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:01 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 15/22] sunxi: Move SPL_TEXT_BASE to the board Kconfig Date: Tue, 1 Nov 2022 00:08:27 -0500 Message-Id: <20221101050835.2421-16-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean It makes sense to put this near the definition of SUNXI_SRAM_ADDRESS. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 5 +++++ common/spl/Kconfig | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 1abb3e1816..b561dd467f 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -73,6 +73,11 @@ config SPL_STACK_R_ADDR default 0x4fe00000 if SUNXI_MINIMUM_DRAM_MB >= 256 default 0x43e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 +config SPL_TEXT_BASE + default 0x10060 if MACH_SUN9I || MACH_SUN50I || MACH_SUN50I_H5 + default 0x20060 if SUN50I_GEN_H6 + default 0x00060 + config SUNXI_MINIMUM_DRAM_MB int default 32 if MACH_SUNIV diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b1e9926e68..930028b5af 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -260,9 +260,6 @@ config SPL_TEXT_BASE default 0x402F4000 if AM43XX default 0x402F0400 if AM33XX default 0x40301350 if OMAP54XX - default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I - default 0x20060 if SUN50I_GEN_H6 - default 0x00060 if ARCH_SUNXI default 0xfffc0000 if ARCH_ZYNQMP default 0x0 help From patchwork Tue Nov 1 05:08:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697632 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=N59mp5ic; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=tW83FsQA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dRP0gfbz23l6 for ; Tue, 1 Nov 2022 16:11:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2F1218504F; Tue, 1 Nov 2022 06:09:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="N59mp5ic"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="tW83FsQA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BCA8A850A4; Tue, 1 Nov 2022 06:09:13 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 59A4C85035 for ; Tue, 1 Nov 2022 06:09:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 9BA033200927; Tue, 1 Nov 2022 01:09:03 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:09:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279343; x=1667365743; bh=vX s0lm8pj7jhAye4VaxjV+S/xg1wGAI2LTp9FR8fReU=; b=N59mp5icEABOdcl9aI 63o69QY8RGYcQCCmeftVnkCp9/aKC8rN990RqqXqrOh9dB80t3yoVvMNrtz5usXJ mC4B87Tx97mLbR4SitHVuAxQM4sgoH2M8PTAxu3kwF+nGyKCimPnf0Y6Hh5Wyoru N36ZvCrT0/gdQm/g0SCzNsv4kdXgfS+pEUKYdF+MGxohiXHbE1PkjUM3tVVveDtj cwps8GhYdHOpU50rbk+uCFjZ3/4/cw5kDatfewaWZUFbK6PaLKgePxgAE3zDRDJg kiuXQ3ZmVPZiVIy8D0cZxTJXl5qvRpGD3ynV/rcsR6IJu3RFNeA7XA5NOxTRQu5Y Iadg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279343; x=1667365743; bh=vXs0lm8pj7jhA ye4VaxjV+S/xg1wGAI2LTp9FR8fReU=; b=tW83FsQA4DgzEe0kzLHiKDdBaPZuU B273SFGRwEruhDc33+PLbydC2KuPo6D3Lb+jAYDNPPm7OMFxnyGKqx4mminx/k+v 12TviH0FWmITe+M2jAqA7TBsy+QD9ZSXDzueBBLHMFU0SO7pd3KdJEukZotH9Dd8 7r8CfqQ1hWzxMfvS5xIB5mqJcoIs5DfvVt9qf192O0kIdnsuJjRbI/yiBB6ykkTR g5jCL3LMuIS1VBwRTtu92KIvQV+tmTGmmAzUy4KTCY+w7FrbFDyUhgaq9FExrFVm IHidjTzQmAlcrI77kIH1M8Bp/aqRxlnlaCZRJtXiPGyn/qXC8QvJH7lHg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:02 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 16/22] sunxi: Move SYS_LOAD_ADDR to the board Kconfig Date: Tue, 1 Nov 2022 00:08:28 -0500 Message-Id: <20221101050835.2421-17-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This will provide a default value for RISC-V when that is added, and it makes sense to put this option next to the other DRAM layout options. Signed-off-by: Samuel Holland --- Kconfig | 3 --- board/sunxi/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index ef94f88adc..70e159221c 100644 --- a/Kconfig +++ b/Kconfig @@ -508,9 +508,6 @@ config SYS_LOAD_ADDR hex "Address in memory to use by default" default 0x01000000 if ARCH_SOCFPGA default 0x02000000 if PPC || X86 - default 0x81000000 if MACH_SUNIV - default 0x22000000 if MACH_SUN9I - default 0x42000000 if ARCH_SUNXI default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL) default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL || MX6SX || MX6UL || MX6ULL) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index b561dd467f..d463474535 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -129,6 +129,11 @@ config SYS_CONFIG_NAME default "sun50i" if MACH_SUN50I_H6 default "sun50i" if MACH_SUN50I_H616 +config SYS_LOAD_ADDR + default 0x81000000 if MACH_SUNIV + default 0x22000000 if MACH_SUN9I + default 0x42000000 + config SYS_SOC default "sunxi" From patchwork Tue Nov 1 05:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697634 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=chvWS7dm; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=W5e0KD9i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dRn5bdvz23l6 for ; Tue, 1 Nov 2022 16:12:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A5D13850FF; Tue, 1 Nov 2022 06:09:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="chvWS7dm"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="W5e0KD9i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 886178503B; Tue, 1 Nov 2022 06:09:15 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1CE2285047 for ; Tue, 1 Nov 2022 06:09:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 3EF7A3200928; Tue, 1 Nov 2022 01:09:05 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 01 Nov 2022 01:09:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279344; x=1667365744; bh=/D bZCRoFQotr0vqjFt4lTuWMECykwFP+ebqp54YHsf4=; b=chvWS7dmsX7jl6OGfE f0uD+Z5pefuaoqcajGP792T470bB2K+ZQgeQpTj2t4+wm5/H/Y6TNgJs32bvkDTY 7O1pmAUQEqnNhqEpyZbT8PLbR2dC2qy05A/JqXajU33Wfh/O5ihWkvWEJ5uJ0AJP hngnXj9mRiZdFYZsyXC9/WAglgKu1/Kihn/mbhbg1wzOS1Y2g0l9XpVBCfCdaV7i uvbRTt+ZTHHPcUhKLhlDXXPniQKtaXYOlenl6rNLserK/WmUSaCFFr0EncITA0Fj 8ARImKNftYsM3Aab217d/vUV52HFDNcfXVbv+cv92jOcraEcj3nuvnp7hDJlU8o5 riww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279344; x=1667365744; bh=/DbZCRoFQotr0 vqjFt4lTuWMECykwFP+ebqp54YHsf4=; b=W5e0KD9i6fazs1uh/3Jyw3p1nU42U MXy1/ZgxvXgoDGmEMg/A5RawlMe64RrzkigFOIjOgb6x51YNABcDGMZPqPE2g9qU PLspyiKp+UFhNqaHW9l0pXAo84WALSFwXrN/StfTKgQDsA10upqxFTtnrBKZAqaA ybUTi5RGv9JtGPnBH5zRNvdO7KFj+kZCEuyI8oNNAhvzWdoEk3M2bONpxbq7LlHG /wu3+PkIDtK4gjoImX/ARN7yw0txEGfMSOE+JpEPZ3MVGO0aBSyHUng/8fJyCIEy ODEQtNBYSQMwlucYpM0OYxCRJQA6fl8Jx+Y2DdkgSgMsCWSL6Uq+ZCNmw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:04 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 17/22] sunxi: Move TEXT_BASE to the board Kconfig Date: Tue, 1 Nov 2022 00:08:29 -0500 Message-Id: <20221101050835.2421-18-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This is how the vast majority of platforms provided TEXT_BASE. sunxi was the exception here. Signed-off-by: Samuel Holland --- board/sunxi/Kconfig | 6 ++++++ boot/Kconfig | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index d463474535..7ff0275ae4 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -137,6 +137,12 @@ config SYS_LOAD_ADDR config SYS_SOC default "sunxi" +config TEXT_BASE + default 0x81700000 if MACH_SUNIV + default 0x2a000000 if MACH_SUN9I + default 0x4a000000 if SUNXI_MINIMUM_DRAM_MB >= 256 + default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 + menu "sunxi board options" choice diff --git a/boot/Kconfig b/boot/Kconfig index d5c582ebe8..b650a0b052 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -633,10 +633,6 @@ config TEXT_BASE depends on HAVE_TEXT_BASE default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 - default 0x81700000 if MACH_SUNIV - default 0x2a000000 if MACH_SUN9I - default 0x4a000000 if SUNXI_MINIMUM_DRAM_MB >= 256 - default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64 hex "Text Base" help The address in memory that U-Boot will be running from, initially. From patchwork Tue Nov 1 05:08:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697635 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=e/5NTUvB; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=fALVdFv6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dS05sGCz23l6 for ; Tue, 1 Nov 2022 16:12:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CF2C850A4; Tue, 1 Nov 2022 06:09:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="e/5NTUvB"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="fALVdFv6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A22A484F84; Tue, 1 Nov 2022 06:09:16 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 59B178502B for ; Tue, 1 Nov 2022 06:09:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id D3CE73200893; Tue, 1 Nov 2022 01:09:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 01 Nov 2022 01:09:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279346; x=1667365746; bh=Nj hcOqLp1cfQEd9luWyIy+VFx1jNYDZkuZ7OEMfhMt8=; b=e/5NTUvBDRDlyAkXgk jLA++pi3cDqBghozzb4FGNI6lKR8wybS4h+qCO7tqVIgzzHo8LF+LyPlrt230pYO +6bpbJlihOECK9s4e/yqP/JlNh675r0BwimcuvZDG7F2hoK9gxm/srIEmawwZdZB VwDUZZaO5JyEHAvm9Gn1mCFouUpaw18xjWkVvXFcerPXksNqn0qpQiaQflArc70m e53qau7wqE5cUyvCMoDssVPi93zFazLQ0p/4/xw2zW5PyU6AUJJKdvtjBX03H3gJ Nd8NGo3WWj0gnfhOvqtUcn3BPInPm90fRVe+HCwVWsXomeNoljZ8yt4tisjyUXTN ppmw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279346; x=1667365746; bh=NjhcOqLp1cfQE d9luWyIy+VFx1jNYDZkuZ7OEMfhMt8=; b=fALVdFv66SQ8GRneKV93dUcKBemt9 VDSNQd+ROTqiAqVAc6D4thvtM3Y4AyGzYGsGZXGHXgV5dPHuLrY1EbTrudKimH2J AO7sO2cgCtWnxp/urx7xn9G4tqyn7EaKdYu5wMeuHenlnFxRNFjU1h5fl+oBKr7B ZyhYB/bOJkTf+9zG4kpiQmikTvMnL7TClq5FJVaJ6dROibtiKobJYlYHfHHWVlg/ Z8JP4GPgj6CTAB0VJZgoa6obIXseGr5kV3mk/Kt8MDf+xx2jILeiGVKHPsGfkyiU oH3osSw/bekf0AJo5IjC3GFM7t/1NyyMRKlXvXTabZY/+UdQ27sU0pX2A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:05 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 18/22] sunxi: Move most board options to the board Kconfig Date: Tue, 1 Nov 2022 00:08:30 -0500 Message-Id: <20221101050835.2421-19-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This excludes options that are inherently ARM-specific or are specific to legacy non-DM drivers. Some help text is cleaned up along the way. Signed-off-by: Samuel Holland --- arch/arm/mach-sunxi/Kconfig | 71 ------------------------------------ board/sunxi/Kconfig | 72 +++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 71 deletions(-) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 24840f6d7e..ff21d94842 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -559,16 +559,6 @@ config DRAM_ODT_CORRECTION then the correction is negative. Usually the value for this is 0. endif -config UART0_PORT_F - bool "UART0 on MicroSD breakout board" - ---help--- - Repurpose the SD card slot for getting access to the UART0 serial - console. Primarily useful only for low level u-boot debugging on - tablets, where normal UART0 is difficult to access and requires - device disassembly and/or soldering. As the SD card can't be used - at the same time, the system can be only booted in the FEL mode. - Only enable this if you really know what you are doing. - config OLD_SUNXI_KERNEL_COMPAT bool "Enable workarounds for booting old kernels" ---help--- @@ -609,20 +599,6 @@ config MMC3_CD_PIN ---help--- See MMC0_CD_PIN help text. -config MMC1_PINS_PH - bool "Pins for mmc1 are on Port H" - depends on MACH_SUN4I || MACH_SUN7I || MACH_SUN8I_R40 - ---help--- - Select this option for boards where mmc1 uses the Port H pinmux. - -config MMC_SUNXI_SLOT_EXTRA - int "mmc extra slot number" - default -1 - ---help--- - sunxi builds always enable mmc0, some boards also have a second sdcard - slot or emmc on mmc1 - mmc3. Setting this to 1, 2 or 3 will enable - support for this. - config USB0_VBUS_PIN string "Vbus enable pin for usb0 (otg)" default "" @@ -699,16 +675,6 @@ config AXP_GPIO ---help--- Say Y here to enable support for the gpio pins of the axp PMIC ICs. -config AXP_DISABLE_BOOT_ON_POWERON - bool "Disable device boot on power plug-in" - depends on AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER - default n - ---help--- - Say Y here to prevent the device from booting up because of a plug-in - event. When set, the device will boot into the SPL briefly to - determine why it was powered on, and if it was determined because of - a plug-in event instead of a button press event it will shut back off. - config VIDEO_SUNXI bool "Enable graphical uboot console on HDMI, LCD or VGA" depends on !MACH_SUN8I_A83T @@ -937,41 +903,4 @@ config SPL_SPI_SUNXI sunxi SPI Flash. It uses the same method as the boot ROM, so does not need any extra configuration. -config PINE64_DT_SELECTION - bool "Enable Pine64 device tree selection code" - depends on MACH_SUN50I - help - The original Pine A64 and Pine A64+ are similar but different - boards and can be differed by the DRAM size. Pine A64 has - 512MiB DRAM, and Pine A64+ has 1GiB or 2GiB. By selecting this - option, the device tree selection code specific to Pine64 which - utilizes the DRAM size will be enabled. - -config PINEPHONE_DT_SELECTION - bool "Enable PinePhone device tree selection code" - depends on MACH_SUN50I - help - Enable this option to automatically select the device tree for the - correct PinePhone hardware revision during boot. - -config BLUETOOTH_DT_DEVICE_FIXUP - string "Fixup the Bluetooth controller address" - default "" - help - This option specifies the DT compatible name of the Bluetooth - controller for which to set the "local-bd-address" property. - Set this option if your device ships with the Bluetooth controller - default address. - The used address is "bdaddr" if set, and "ethaddr" with the LSB - flipped elsewise. - endif - -config CHIP_DIP_SCAN - bool "Enable DIPs detection for CHIP board" - select SUPPORT_EXTENSION_SCAN - select W1 - select W1_GPIO - select W1_EEPROM - select W1_EEPROM_DS24XXX - select CMD_EXTENSION diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 7ff0275ae4..f5e5c3770f 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -171,6 +171,78 @@ config SPL_IMAGE_TYPE default "sunxi_egon" if SPL_IMAGE_TYPE_SUNXI_EGON default "sunxi_toc0" if SPL_IMAGE_TYPE_SUNXI_TOC0 +config MMC_SUNXI_SLOT_EXTRA + int "MMC extra slot number" + default -1 + help + sunxi builds always enable mmc0. Some boards also have a + second SD card slot or eMMC on mmc1 - mmc3. Setting this to 1, + 2 or 3 will enable support for this. + +config MMC1_PINS_PH + bool "MMC1 pins are on Port H" + depends on MACH_SUN4I || MACH_SUN7I || MACH_SUN8I_R40 + help + Select this option on boards where mmc1 uses the Port H pinmux. + +config UART0_PORT_F + bool "UART0 pins are on Port F (MicroSD breakout board)" + help + Repurpose the SD card slot for getting access to the UART0 + serial console. Primarily useful only for low level u-boot + debugging on tablets, where normal UART0 is difficult to + access and requires device disassembly and/or soldering. As + the SD card can't be used at the same time, the system can be + only booted in FEL mode. Only enable this if you really know + what you are doing. + +config AXP_DISABLE_BOOT_ON_POWERON + bool "Disable device boot on power plug-in" + depends on AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + help + Say Y here to prevent the device from booting up because of a + plug-in event. When set, the device will boot into the SPL + briefly to determine why it was powered on, and if the board + was powered on because of a plug-in event instead of a button + press event, it will shut back off. + +config CHIP_DIP_SCAN + bool "Enable DIPs detection for CHIP board" + select SUPPORT_EXTENSION_SCAN + select W1 + select W1_GPIO + select W1_EEPROM + select W1_EEPROM_DS24XXX + select CMD_EXTENSION + +config PINE64_DT_SELECTION + bool "Enable Pine64 device tree selection code" + depends on MACH_SUN50I + help + The original Pine A64 and Pine A64+ are similar but different + boards and can be differed by the DRAM size. Pine A64 has + 512MiB DRAM, and Pine A64+ has 1GiB or 2GiB. By selecting this + option, the device tree selection code specific to Pine64 which + utilizes the DRAM size will be enabled. + +config PINEPHONE_DT_SELECTION + bool "Enable PinePhone device tree selection code" + depends on MACH_SUN50I + help + Enable this option to automatically select the device tree for the + correct PinePhone hardware revision during boot. + +config BLUETOOTH_DT_DEVICE_FIXUP + string "Fixup the Bluetooth controller address" + default "" + help + This option specifies the DT compatible name of the Bluetooth + controller for which to set the "local-bd-address" property. + Set this option if your device ships with the Bluetooth controller + default address. + The used address is "bdaddr" if set, and "ethaddr" with the LSB + flipped elsewise. + endmenu endif From patchwork Tue Nov 1 05:08:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697636 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=bRlZlGB5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=AJ1AKt0p; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dSB2LRSz23l6 for ; Tue, 1 Nov 2022 16:12:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6CB9B85102; Tue, 1 Nov 2022 06:09:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="bRlZlGB5"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="AJ1AKt0p"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0A79C8504B; Tue, 1 Nov 2022 06:09:17 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4A83F85037 for ; Tue, 1 Nov 2022 06:09:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 74AC13200922; Tue, 1 Nov 2022 01:09:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:09:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279348; x=1667365748; bh=T/ aMLbij08K58Dt4NXqCKUiBaxp57sKS33PLyAC0iGM=; b=bRlZlGB5S0Fi0yYXcI skVI/ZIDZgRxSF91zxlHXANuc0qU8/bXUQ8BWWIzWRSW7d2ujsHJLXXMYpImuNcy oEJmvPASRXKan5K48E6uyQXHa5Ixc6YHNBPQR0yM6lEA7evW+sVMqU0KoyhmRI6S hn+cILXnFluZ+mVaBbzZ1AWn5xOwVDr11pwZPQk6tbiX66TXDEDniE3HH4KcubbC ixKTAeulwa050TahOvcg+Z1vB9TCNyIjqpeJ5EK7bdpQDGdpEVIOK66gLXpY+1F0 Be3LH6NniVLF53E6TYJ+9Cl61zmh3YaRiTKjXslS7OlV7P4MKDM//Vv/ZCsQ7K6T JXcw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279348; x=1667365748; bh=T/aMLbij08K58 Dt4NXqCKUiBaxp57sKS33PLyAC0iGM=; b=AJ1AKt0pyzpwrm1CiD1EbszzCvj+Z ebXuqBmnI48cT8LjXNCCKeAdFAqCn137QzMMuoNmN5zNZdkROYi8PEehdQa8SiaF 5a/zmKGbPrQATXzBKsejA8nosaCgVFoG0ldUCzViBG2N341GL9c/nMf2uOKgUH5C Jm0osFPMpe7nbXhg4yVWWww4Y5jZx+x42mfNXhZbaOBRI1te+9ry1rWzYBkGJKz2 fm4Ox3jAgzHwKMleFvwNJ/+Cg/4pszyL2RQd0rnxczPYY7+o7P1udCZNNYQPdhxI OBd9My42rugyDO8P1t7BfI+n2bS7EOocXLbZkr0ZwfpTPD18/qvYsBDFw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:07 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 19/22] env: sunxi: Replace ARCH_SUNXI with BOARD_SUNXI Date: Tue, 1 Nov 2022 00:08:31 -0500 Message-Id: <20221101050835.2421-20-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This ensures the same environment layout will be used across all sunxi boards, regardless of CPU architecture. Signed-off-by: Samuel Holland --- env/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index 24111dfaf4..ae28e4e3e6 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -92,7 +92,7 @@ config ENV_IS_IN_FAT bool "Environment is in a FAT filesystem" depends on !CHAIN_OF_TRUST default y if ARCH_BCM283X - default y if ARCH_SUNXI && MMC + default y if BOARD_SUNXI && MMC default y if MMC_OMAP_HS && TI_COMMON_CMD_OPTIONS select FS_FAT select FAT_WRITE @@ -338,7 +338,7 @@ config ENV_IS_IN_SPI_FLASH default y if NORTHBRIDGE_INTEL_IVYBRIDGE default y if INTEL_QUARK default y if INTEL_QUEENSBAY - default y if ARCH_SUNXI + default y if BOARD_SUNXI help Define this if you have a SPI Flash memory device which you want to use for the environment. @@ -461,7 +461,7 @@ config ENV_FAT_DEVICE_AND_PART depends on ENV_IS_IN_FAT default "0:1" if TI_COMMON_CMD_OPTIONS default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL - default ":auto" if ARCH_SUNXI + default ":auto" if BOARD_SUNXI default "0" if ARCH_AT91 help Define this to a string to specify the partition of the device. It can @@ -555,7 +555,7 @@ config ENV_OFFSET ENV_IS_IN_SPI_FLASH default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH - default 0xF0000 if ARCH_SUNXI + default 0xF0000 if BOARD_SUNXI default 0xE0000 if ARCH_ZYNQ default 0x1E00000 if ARCH_ZYNQMP default 0x7F40000 if ARCH_VERSAL || ARCH_VERSAL_NET @@ -580,7 +580,7 @@ config ENV_SIZE hex "Environment Size" default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91 - default 0x10000 if ARCH_SUNXI + default 0x10000 if BOARD_SUNXI default 0x8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC default 0x2000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH default 0x8000 if ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET @@ -596,7 +596,7 @@ config ENV_SECT_SIZE default 0x40000 if ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET default 0x20000 if ARCH_ZYNQ || ARCH_OMAP2PLUS || ARCH_AT91 default 0x20000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH - default 0x10000 if ARCH_SUNXI && ENV_IS_IN_SPI_FLASH + default 0x10000 if BOARD_SUNXI && ENV_IS_IN_SPI_FLASH help Size of the sector containing the environment. From patchwork Tue Nov 1 05:08:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697637 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=qYtZ23GD; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=UfMRx7Zp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dSP0B2rz23l6 for ; Tue, 1 Nov 2022 16:12:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2DA828510E; Tue, 1 Nov 2022 06:09:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="qYtZ23GD"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UfMRx7Zp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0629285037; Tue, 1 Nov 2022 06:09:18 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5EE7E85088 for ; Tue, 1 Nov 2022 06:09:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 1229B3200437; Tue, 1 Nov 2022 01:09:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 01 Nov 2022 01:09:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279349; x=1667365749; bh=Jf IX8qzbArOIkNrARtVRriHkvQkJwBFjg8TH78VeylY=; b=qYtZ23GDiNUSakhoTH hRelmWaPM2U4AGO//guR//webWXQeD4tHDlov+xrBLlKHM0XFkqW8n4dmaWRkDwk Z9OBM+OgF9UKCtqBHrC1tEs7apicPKjFxSgt9HcC0pASQC3RR8gL4xp24ciw3DoD TFhK2SJuhzR1XcWky+ROHsrb656BnOz+IrjLdvml83o7Lu0HbPKqNTRN13A2w+aV NKhktwAVoryVwi9Y2Cwb5iDRTGQPu7s+xM2H+dxLztACnG8lrNObCcgqO7T/e+p8 Hx1/IcoTJA3SVkBEn8Fak020ZFYbHsMFuDhd04Pe4VMBc2rphIKImpBO8iBjsiZk Y0Fw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279349; x=1667365749; bh=JfIX8qzbArOIk NrARtVRriHkvQkJwBFjg8TH78VeylY=; b=UfMRx7ZpYSxbutCuuuJMVNbKqx/MG RiEXdNlCMP4/+xUXHmA/NvwWzlbkwcW5HjkRSfNkhux6AbBkQsBjKihtQ2g1tzIM 2Z/FyNGSE+7zEkBiHRDfmSxjA8CxmzsljsFHc9laHcmpPCkKGPKZGyBua4h/De/w urAQZAf2Fm8N92V/J5bwQaHI9kEyEKqpMxE9GHHkC4OONF2YxmiSqBEko1vd5VRC WFhClycLtj7+ZFJLPqwWxWJKu0i/0Yi42QSVSbT+JlwwIWq7b4p+A5+Y1Y4vaKfF ogZcU3+fjoQVdNeteerKqxfXvji9N0uIWfC3xBIL51ydcY8FXjURaq23g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:09 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 20/22] drivers: sunxi: Replace ARCH_SUNXI with BOARD_SUNXI Date: Tue, 1 Nov 2022 00:08:32 -0500 Message-Id: <20221101050835.2421-21-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This provides a unified configuration across all sunxi boards, regardless of CPU architecture. Signed-off-by: Samuel Holland --- drivers/clk/sunxi/Kconfig | 2 +- drivers/fastboot/Kconfig | 13 ++++++------- drivers/gpio/Kconfig | 2 +- drivers/mmc/Kconfig | 2 +- drivers/net/phy/Kconfig | 4 ++-- drivers/phy/allwinner/Kconfig | 2 +- drivers/pinctrl/sunxi/Kconfig | 2 +- drivers/reset/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/usb/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 8 ++++---- drivers/usb/musb-new/Kconfig | 2 +- drivers/video/Kconfig | 2 +- drivers/watchdog/Kconfig | 4 ++-- 14 files changed, 24 insertions(+), 25 deletions(-) diff --git a/drivers/clk/sunxi/Kconfig b/drivers/clk/sunxi/Kconfig index bf11fad6ee..72310e231d 100644 --- a/drivers/clk/sunxi/Kconfig +++ b/drivers/clk/sunxi/Kconfig @@ -1,6 +1,6 @@ config CLK_SUNXI bool "Clock support for Allwinner SoCs" - depends on CLK && ARCH_SUNXI + depends on CLK && BOARD_SUNXI select DM_RESET select SPL_DM_RESET if SPL_CLK default y diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index b97c67bf60..a55fdac370 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -8,7 +8,7 @@ config FASTBOOT config USB_FUNCTION_FASTBOOT bool "Enable USB fastboot gadget" depends on USB_GADGET - default y if ARCH_SUNXI && USB_MUSB_GADGET + default y if BOARD_SUNXI && USB_MUSB_GADGET select FASTBOOT select USB_GADGET_DOWNLOAD help @@ -32,10 +32,9 @@ if FASTBOOT config FASTBOOT_BUF_ADDR hex "Define FASTBOOT buffer address" + default SYS_LOAD_ADDR if BOARD_SUNXI default 0x82000000 if MX6SX || MX6SL || MX6UL || MX6SLL default 0x81000000 if ARCH_OMAP2PLUS - default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I - default 0x22000000 if ARCH_SUNXI && MACH_SUN9I default 0x60800800 if ROCKCHIP_RK3036 || ROCKCHIP_RK3188 || \ ROCKCHIP_RK322X default 0x800800 if ROCKCHIP_RK3288 || ROCKCHIP_RK3329 || \ @@ -52,7 +51,7 @@ config FASTBOOT_BUF_SIZE hex "Define FASTBOOT buffer size" default 0x8000000 if ARCH_ROCKCHIP default 0x6000000 if ARCH_ZYNQMP - default 0x2000000 if ARCH_SUNXI + default 0x2000000 if BOARD_SUNXI default 0x8192 if SANDBOX default 0x7000000 help @@ -71,7 +70,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" - default y if ARCH_SUNXI || ARCH_ROCKCHIP + default y if BOARD_SUNXI || ARCH_ROCKCHIP depends on MMC || (MTD_RAW_NAND && CMD_MTDPARTS) select IMAGE_SPARSE help @@ -105,8 +104,8 @@ config FASTBOOT_FLASH_MMC_DEV int "Define FASTBOOT MMC FLASH default device" depends on FASTBOOT_FLASH_MMC default 0 if ARCH_ROCKCHIP - default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 - default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 + default 0 if BOARD_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 + default 1 if BOARD_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 help The fastboot "flash" command requires additional information regarding the non-volatile storage device. Define this to diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index ff87fbfb39..defdb91368 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -363,7 +363,7 @@ config SANDBOX_GPIO_COUNT config SUNXI_GPIO bool "Allwinner GPIO driver" - depends on ARCH_SUNXI + depends on BOARD_SUNXI select SPL_STRTO if SPL help Support the GPIO device in Allwinner SoCs. diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 56f42820c7..6a7271de75 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -749,7 +749,7 @@ config ZYNQ_HISPD_BROKEN config MMC_SUNXI bool "Allwinner sunxi SD/MMC Host Controller support" - depends on ARCH_SUNXI + depends on BOARD_SUNXI default y help This selects support for the SD/MMC Host Controller on diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 52ce08b3b3..a68298fa08 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -19,14 +19,14 @@ if PHYLIB config PHY_ADDR_ENABLE bool "Limit phy address" - default y if ARCH_SUNXI + default y if BOARD_SUNXI help Select this if you want to control which phy address is used if PHY_ADDR_ENABLE config PHY_ADDR int "PHY address" - default 1 if ARCH_SUNXI + default 1 if BOARD_SUNXI default 0 help The address of PHY on MII bus. Usually in range of 0 to 31. diff --git a/drivers/phy/allwinner/Kconfig b/drivers/phy/allwinner/Kconfig index f8f1e99c4f..ab43681f0c 100644 --- a/drivers/phy/allwinner/Kconfig +++ b/drivers/phy/allwinner/Kconfig @@ -3,7 +3,7 @@ # config PHY_SUN4I_USB bool "Allwinner Sun4I USB PHY driver" - depends on ARCH_SUNXI + depends on BOARD_SUNXI select DM_REGULATOR select PHY help diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig index 77da90836b..eb574236a3 100644 --- a/drivers/pinctrl/sunxi/Kconfig +++ b/drivers/pinctrl/sunxi/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -if ARCH_SUNXI +if BOARD_SUNXI config PINCTRL_SUNXI select PINCTRL_FULL diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 4cb0ba0850..cb15372306 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -137,7 +137,7 @@ config RESET_MTMIPS config RESET_SUNXI bool "RESET support for Allwinner SoCs" - depends on DM_RESET && ARCH_SUNXI + depends on DM_RESET && BOARD_SUNXI default y help This enables support for common reset driver for diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 34b92ceaee..20412e1887 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -442,7 +442,7 @@ config SOFT_SPI config SPI_SUNXI bool "Allwinner SoC SPI controllers" - default ARCH_SUNXI + default BOARD_SUNXI help Enable the Allwinner SoC SPi controller driver. diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 3afb45d5cc..8c0d4da193 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -116,7 +116,7 @@ config USB_KEYBOARD_FN_KEYS choice prompt "USB keyboard polling" - default SYS_USB_EVENT_POLL_VIA_INT_QUEUE if ARCH_SUNXI + default SYS_USB_EVENT_POLL_VIA_INT_QUEUE if BOARD_SUNXI default SYS_USB_EVENT_POLL ---help--- Enable a polling mechanism for USB keyboard. diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index e8da73c788..19071e003e 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -40,7 +40,7 @@ if USB_GADGET config USB_GADGET_MANUFACTURER string "Vendor name of the USB device" - default "Allwinner Technology" if ARCH_SUNXI + default "Allwinner Technology" if BOARD_SUNXI default "Rockchip" if ARCH_ROCKCHIP default "U-Boot" help @@ -49,7 +49,7 @@ config USB_GADGET_MANUFACTURER config USB_GADGET_VENDOR_NUM hex "Vendor ID of the USB device" - default 0x1f3a if ARCH_SUNXI + default 0x1f3a if BOARD_SUNXI default 0x2207 if ARCH_ROCKCHIP default 0x0 help @@ -59,7 +59,7 @@ config USB_GADGET_VENDOR_NUM config USB_GADGET_PRODUCT_NUM hex "Product ID of the USB device" - default 0x1010 if ARCH_SUNXI + default 0x1010 if BOARD_SUNXI default 0x310a if ROCKCHIP_RK3036 default 0x300a if ROCKCHIP_RK3066 default 0x310c if ROCKCHIP_RK3128 @@ -202,7 +202,7 @@ endif # USB_GADGET_DOWNLOAD config USB_ETHER bool "USB Ethernet Gadget" depends on NET - default y if ARCH_SUNXI && USB_MUSB_GADGET + default y if BOARD_SUNXI && USB_MUSB_GADGET help Creates an Ethernet network device through a USB peripheral controller. This will create a network interface on both the device diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig index 51f876cd71..d2d86a5c0e 100644 --- a/drivers/usb/musb-new/Kconfig +++ b/drivers/usb/musb-new/Kconfig @@ -67,7 +67,7 @@ config USB_MUSB_PIC32 config USB_MUSB_SUNXI bool "Enable sunxi OTG / DRC USB controller" - depends on ARCH_SUNXI + depends on BOARD_SUNXI select USB_MUSB_PIO_ONLY default y ---help--- diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index c841b99bb3..4e9e179d12 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -183,7 +183,7 @@ config CONSOLE_TRUETYPE_MAX_METRICS config SYS_WHITE_ON_BLACK bool "Display console as white on a black background" - default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || ARCH_TEGRA || X86 || ARCH_SUNXI + default y if ARCH_AT91 || ARCH_EXYNOS || ARCH_ROCKCHIP || ARCH_TEGRA || X86 || BOARD_SUNXI help Normally the display is black on a white background, Enable this option to invert this, i.e. white on a black background. This can be diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f1b1cf63ca..575dea5da5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -29,7 +29,7 @@ config WATCHDOG_TIMEOUT_MSECS default 128000 if ARCH_MX31 || ARCH_MX5 || ARCH_MX6 default 128000 if ARCH_MX7 || ARCH_VF610 default 30000 if ARCH_SOCFPGA - default 16000 if ARCH_SUNXI + default 16000 if BOARD_SUNXI default 60000 help Watchdog timeout in msec @@ -321,7 +321,7 @@ config WDT_STM32MP config WDT_SUNXI bool "Allwinner sunxi watchdog timer support" - depends on WDT && ARCH_SUNXI + depends on WDT && BOARD_SUNXI default y help Enable support for the watchdog timer in Allwinner sunxi SoCs. From patchwork Tue Nov 1 05:08:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697639 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=F2/TEeZH; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=ff3zaGB1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dSx0zQbz23l6 for ; Tue, 1 Nov 2022 16:13:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1D1085123; Tue, 1 Nov 2022 06:09:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="F2/TEeZH"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="ff3zaGB1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6B1685090; Tue, 1 Nov 2022 06:09:19 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5D86985097 for ; Tue, 1 Nov 2022 06:09:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B0A973200907; Tue, 1 Nov 2022 01:09:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:09:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279351; x=1667365751; bh=hK BGttS9PvPajZesujrlowSzFdpiLTz+2herzP+TuMI=; b=F2/TEeZHRRIWA6duGm MjZkHUBwzRF8StrgJ+0Frhl0skfvL6KSM3Ag6O2TFQNesLYervmLI7TAQEBr3aPL 5a4cyIxLrB+n7i6kY7LuLs9BBQDyQE6zG6Aa3WMv9RFAqW3G89BobUKSR5Iz0Tmm K2tuJa6LA2Tv0CXA/0p72J6mbo5wOeP7nfu9cx5JVU8zWytmgH7JVZAxYsY+LWhm O0cjSIRH9OmzVqqdL5ROFtLePMsJSQLPNuFJVvJT1pMAf/01S305V0i7ENp98lwE /+uvr70n9vkmexgHsN+RjXNDwFPhkUuPs2OP+u0n9tTaPhC1eBMsmEjRDCwL27Nw zm2A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279351; x=1667365751; bh=hKBGttS9PvPaj ZesujrlowSzFdpiLTz+2herzP+TuMI=; b=ff3zaGB1ntmLIK0gSQAMPApwO+847 zxufRw7TPa03KudPIgPkgfE6/kUjltAKNJm3PZGArqHjANNgJGCGHmbOfrYg6oAL OtwvX2I/P48xBPMi5qWMTVKE8Jis59VJBk/+oa+gzN0IxyjzUZDndKeynHNwn2KJ 9GMRmyfnJbjMiZzXqzeCIsbdzs5Ur/rxBxX0bwDD05YBE5AbDA4hPVbKckUiYQi+ MDrmoN6OpXl/aw63I7kraV/OCEoFTh5R2wX76CGWWYFGCao2qRRX5XNyhPcA6okU NbVl0kcOqNuc1crw1O2/H8vY87HJkzFDVYpODY2ks1relAFH+kBzYEkJg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpeeinecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:10 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 21/22] disk: sunxi: Replace ARCH_SUNXI with BOARD_SUNXI Date: Tue, 1 Nov 2022 00:08:33 -0500 Message-Id: <20221101050835.2421-22-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This provides a unified configuration across all sunxi boards, regardless of CPU architecture. Signed-off-by: Samuel Holland --- disk/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/disk/Kconfig b/disk/Kconfig index c9b9dbaf1a..b9d3625dc2 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -61,7 +61,7 @@ config SPL_DOS_PARTITION bool "Enable MS Dos partition table for SPL" depends on SPL default n if ARCH_MVEBU - default n if ARCH_SUNXI + default n if BOARD_SUNXI default y if DOS_PARTITION select SPL_PARTITIONS @@ -104,7 +104,7 @@ config EFI_PARTITION config EFI_PARTITION_ENTRIES_NUMBERS int "Number of the EFI partition entries" depends on EFI_PARTITION - default 56 if ARCH_SUNXI + default 56 if BOARD_SUNXI default 128 help Specify the number of partition entries in the GPT. This is @@ -132,7 +132,7 @@ config SPL_EFI_PARTITION bool "Enable EFI GPT partition table for SPL" depends on SPL default n if ARCH_MVEBU - default n if ARCH_SUNXI + default n if BOARD_SUNXI default y if EFI_PARTITION select SPL_PARTITIONS From patchwork Tue Nov 1 05:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1697638 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=OtMIx0Aq; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=eDVLo5Zr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [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 (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4N1dSj33NPz23l6 for ; Tue, 1 Nov 2022 16:12:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 154438511A; Tue, 1 Nov 2022 06:09:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="OtMIx0Aq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="eDVLo5Zr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC58185088; Tue, 1 Nov 2022 06:09:18 +0100 (CET) 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,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 108B085059 for ; Tue, 1 Nov 2022 06:09:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 5AA073200922; Tue, 1 Nov 2022 01:09:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 01 Nov 2022 01:09:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667279352; x=1667365752; bh=nv 1OyiNzvIM34SmJfTggZCrR8seLopXeEYHyJJI4CJs=; b=OtMIx0Aq5H6OlYt4HF NqhlZsH2/Q+eFF1uZ/kSrbq/nj+OIu+YBJS0s97hGH3badRcS4onUtf8MoRV6HX0 zvWnkLZZYtXCK/MdBT2LTLpFOmFRrqvVo4jjwf3eABGkxJX3FJybgO/etdryvp7U QoaafYwIQlrrETDyq7yYcurGH5NKhsMvaaeTKKYy8SRZ4/fg68a1dXrM2oGLuk0g 9nqYkd6Rn2j9UqJ3VAXsfn4IRihpoe4dpGMLzxKjnBypSflymsXuqPsypoW9kaD9 ymUFoVdjGopBGovj72xNcjMfQNQ9RNDlltBGLBNZnyo1XACTIvB/2BMvnBbcrE2m o5yA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667279352; x=1667365752; bh=nv1OyiNzvIM34 SmJfTggZCrR8seLopXeEYHyJJI4CJs=; b=eDVLo5Zr6I8ZB61YJ3+Ku5LKphHKl z1j3HpkZ8b4p/krrv96BR/z+nXWxkTzrmZ4oL0s87mJluCxzUqv3ZzDSblMIirGc 9SV6hcitj0BGUVSg5z6qKjePfXnT/23STok8cjWulM5fXGzfejy2wiQy2NUv8lNQ tNaZzlZXpHy8YoFf0NZj0/R3KTaU9akLPNcsLJRQP2PSJqPMTu9A1w/q6dg9nuPf HH6JBh48dAEM/NeJXho2RkYRy7BMzzymRXKcAgTbZQzfH9ju5wmzxfMIWRfiUumN 64kmtgaGTzDvxYuIKm/ZFTmGtw9MRt4swqhXoEHWdT8uCIbAvNYBPMdZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrudeggdekvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpeeinecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Nov 2022 01:09:12 -0400 (EDT) From: Samuel Holland To: Andre Przywara , Jagan Teki Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH 22/22] spl: sunxi: Replace ARCH_SUNXI with BOARD_SUNXI Date: Tue, 1 Nov 2022 00:08:34 -0500 Message-Id: <20221101050835.2421-23-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221101050835.2421-1-samuel@sholland.org> References: <20221101050835.2421-1-samuel@sholland.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This provides a unified configuration across all sunxi boards, regardless of CPU architecture. Signed-off-by: Samuel Holland --- common/spl/Kconfig | 12 ++++++------ scripts/Makefile.spl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 930028b5af..5ff75aad9f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -110,7 +110,7 @@ config SPL_PAD_TO config SPL_HAS_BSS_LINKER_SECTION depends on SPL_FRAMEWORK bool "Use a specific address for the BSS via the linker script" - default y if ARCH_SUNXI || ARCH_MX6 || ARCH_OMAP2PLUS || MIPS || RISCV || ARCH_ZYNQMP + default y if ARCH_MX6 || ARCH_OMAP2PLUS || ARCH_ZYNQMP || BOARD_SUNXI || MIPS || RISCV config SPL_BSS_START_ADDR hex "Link address for the BSS within the SPL binary" @@ -334,7 +334,7 @@ config SPL_SYS_MALLOC_SIMPLE config SPL_SHARES_INIT_SP_ADDR bool "SPL and U-Boot use the same initial stack pointer location" depends on (ARM || ARCH_JZ47XX || MICROBLAZE || RISCV) && SPL_FRAMEWORK - default n if ARCH_SUNXI || ARCH_MX6 || ARCH_MX7 + default n if BOARD_SUNXI || ARCH_MX6 || ARCH_MX7 default y help In many cases, we can use the same initial stack pointer address for @@ -452,7 +452,7 @@ config SPL_DISPLAY_PRINT config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR bool "MMC raw mode: by sector" - default y if ARCH_SUNXI || ARCH_DAVINCI || ARCH_UNIPHIER || \ + default y if BOARD_SUNXI || ARCH_DAVINCI || ARCH_UNIPHIER || \ ARCH_MX6 || ARCH_MX7 || \ ARCH_ROCKCHIP || ARCH_MVEBU || ARCH_SOCFPGA || \ ARCH_AT91 || ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || \ @@ -465,7 +465,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR hex "Address on the MMC to load U-Boot from" depends on SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR - default 0x40 if ARCH_SUNXI + default 0x40 if BOARD_SUNXI default 0x75 if ARCH_DAVINCI default 0x8a if ARCH_MX6 || ARCH_MX7 default 0x100 if ARCH_UNIPHIER @@ -482,7 +482,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR config SYS_MMCSD_RAW_MODE_U_BOOT_DATA_PART_OFFSET hex "U-Boot main hardware partition image offset" depends on SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR - default 0x10 if ARCH_SUNXI + default 0x10 if BOARD_SUNXI default 0x0 help On some platforms SPL location depends on hardware partition. The ROM @@ -1308,7 +1308,7 @@ endif # SPL_SPI_FLASH_SUPPORT config SYS_SPI_U_BOOT_OFFS hex "address of u-boot payload in SPI flash" - default 0x8000 if ARCH_SUNXI + default 0x8000 if BOARD_SUNXI default 0x0 depends on SPL_SPI_LOAD || SPL_SPI_SUNXI help diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 15ac87286d..819050dd4d 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -264,7 +264,7 @@ endif INPUTS-$(CONFIG_TARGET_SOCFPGA_SOC64) += $(obj)/u-boot-spl-dtb.hex -ifdef CONFIG_ARCH_SUNXI +ifdef CONFIG_BOARD_SUNXI INPUTS-y += $(obj)/sunxi-spl.bin ifdef CONFIG_NAND_SUNXI