From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DCE9FC4332F for ; Sun, 6 Nov 2022 22:41:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B9A384E2B; Sun, 6 Nov 2022 23:40:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="KWpv7r6V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E872484D9F; Sun, 6 Nov 2022 23:40:41 +0100 (CET) Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D959184C66 for ; Sun, 6 Nov 2022 23:40:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x130.google.com with SMTP id m15so5092730ilq.2 for ; Sun, 06 Nov 2022 14:40:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uM47ExJULFFfWSNu9McjjzVNXLMDacvHPnoFuuYPoA4=; b=KWpv7r6VC5O4xcJECPuMGtB8Src75DOeXWs1DFsl8DYDMHucyDXfBOf6vOfuyJZz7x 4XJe2tN1obnijtPlg9LgcyhifwHrMF/hBquX0y5yPd8Z2cVesJvyO+YsUpD6HVR6C94f ByLWYUvj37zLLPMtlH14mNuzwQ2qavi53X4/Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uM47ExJULFFfWSNu9McjjzVNXLMDacvHPnoFuuYPoA4=; b=xLUHrL3p41g1ACqTh+zF/xzAqG8MifuByG8NrPvaSxTBmMf1RRRMiAPsx5KUk5d3Jn VUeWUh4RV/UwX+wvWvxafsndtObCdIzldbuQb0aNBsBoe1+F2WLXnTStWFHKCBbVAqbR y8BQy65E3m/ezTyH4khrr/p3XD/GdVLXs4lgfW9duGX95EmCn3FTOwgcWD9MXpu3yDlB yVWQuK4FH6KZZ0CmPUa1I+dU+KUB/vcn35ZkRaLnjfQInGaaqMgOHY+XO06ZBMFiBgZm B+P5XkGxOjGZLpjGjaGPvQYaljLcBcSVGdnRra8EyykMzuXxRPCgfeaw4iZYOlD77PIu ZZiA== X-Gm-Message-State: ACrzQf2RgBeSf8xWIOmhB7RvPCp/enqb4aokys12veE/0rLFDUsANagF f7rfoPjsyWEil3We8FcE5rT/DmnqFJMXDQ== X-Google-Smtp-Source: AMsMyM4R+3pnIuM6Xx3X1HhYSbt21ULXRDxT3DrmEdUVjpcv7qtjkurLuCZ0mzCAsU5dYq3PINM0sA== X-Received: by 2002:a05:6e02:1caa:b0:300:388e:2273 with SMTP id x10-20020a056e021caa00b00300388e2273mr27197929ill.82.1667774437319; Sun, 06 Nov 2022 14:40:37 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id u192-20020a0223c9000000b00363b8ef4bc5sm2021742jau.71.2022.11.06.14.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Nov 2022 14:40:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Roger Quadros , Alper Nebi Yasak , Peter Geis , Philippe Reynes , Ivan Mikhaylov , Tom Rini , huang lin , Jeffy Chen , Simon Glass , Kever Yang , Philipp Tomsich , Jagan Teki , Philipp Tomsich Subject: [PATCH v4 3/7] rockchip: Include binman script in 64-bit boards Date: Sun, 6 Nov 2022 15:40:06 -0700 Message-Id: <20221106224011.606743-4-sjg@chromium.org> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog In-Reply-To: <20221106224011.606743-1-sjg@chromium.org> References: <20221106224011.606743-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Include the rockchip-u-boot.dtsi file with 64-bit boards and enable binman so that these boards can also use it, rather than using special Makefile rules and scripts. This does not change the Makefile nor remove any scripts, but sets it up so that this is possible. Signed-off-by: Simon Glass Reviewed-by: Alper Nebi Yasak --- (no changes since v1) arch/arm/dts/rk3368-u-boot.dtsi | 1 + arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-u-boot.dtsi | 3 +++ arch/arm/mach-rockchip/Kconfig | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3368-u-boot.dtsi b/arch/arm/dts/rk3368-u-boot.dtsi index 811d59ac346..4c0a6ff1561 100644 --- a/arch/arm/dts/rk3368-u-boot.dtsi +++ b/arch/arm/dts/rk3368-u-boot.dtsi @@ -3,6 +3,7 @@ * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH */ +#include "rockchip-u-boot.dtsi" #include #include "rockchip-u-boot.dtsi" diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi index f8335c74a74..1af3bbfb3d3 100644 --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi @@ -46,7 +46,7 @@ &binman { simple-bin { - blob { + fit { offset = <((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)>; }; }; diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 3c1a15fe51b..63da02489d3 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -62,6 +62,8 @@ #if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM) &binman { + multiple-images; +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE rom { filename = "u-boot.rom"; size = <0x400000>; @@ -81,6 +83,7 @@ fdtmap { }; }; +#endif /* CONFIG_ROCKCHIP_SPI_IMAGE */ }; #endif diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 69d51ff3789..90d42650211 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -15,6 +15,7 @@ config ROCKCHIP_PX30 select DEBUG_UART_BOARD_INIT imply ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD + imply BINMAN help The Rockchip PX30 is a ARM-based SoC with a quad-core Cortex-A35 including NEON and GPU, Mali-400 graphics, several DDR3 options @@ -168,6 +169,7 @@ config ROCKCHIP_RK3308 imply SPL_SERIAL imply TPL_SERIAL imply SPL_SEPARATE_BSS + imply BINMAN help The Rockchip RK3308 is a ARM-based Soc which embedded with quad Cortex-A35 and highly integrated audio interfaces. @@ -189,6 +191,7 @@ config ROCKCHIP_RK3328 select ENABLE_ARM_SOC_BOOT0_HOOK select DEBUG_UART_BOARD_INIT select SYS_NS16550 + imply BINMAN help The Rockchip RK3328 is a ARM-based SoC with a quad-core Cortex-A53. including NEON and GPU, 1MB L2 cache, Mali-T7 graphics, two @@ -208,6 +211,7 @@ config ROCKCHIP_RK3368 imply SPL_SERIAL imply TPL_SERIAL imply TPL_ROCKCHIP_COMMON_BOARD + imply BINMAN help The Rockchip RK3368 is a ARM-based SoC with a octa-core (organised into a big and little cluster with 4 cores each) Cortex-A53 including @@ -266,6 +270,7 @@ config ROCKCHIP_RK3399 imply TPL_ROCKCHIP_COMMON_BOARD imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT imply CMD_BOOTCOUNT if BOOTCOUNT_LIMIT + imply BINMAN help The Rockchip RK3399 is a ARM-based SoC with a dual-core Cortex-A72 and quad-core Cortex-A53. @@ -286,6 +291,7 @@ config ROCKCHIP_RK3568 select SYSCON select BOARD_LATE_INIT imply ROCKCHIP_COMMON_BOARD + imply BINMAN help The Rockchip RK3568 is a ARM-based SoC with quad-core Cortex-A55, including NEON and GPU, 512K L3 cache, Mali-G52 based graphics, -- 2.38.1.431.g37b22c650d-goog