From patchwork Mon Aug 5 12:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 1969070 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LNgry+hk; dkim-atps=neutral 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=patchwork.ozlabs.org) 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 (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WcydD4bQXz1yZl for ; Mon, 5 Aug 2024 23:55:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2B8D28896A; Mon, 5 Aug 2024 15:55:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LNgry+hk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3260588905; Mon, 5 Aug 2024 14:43:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (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 5B77E88915 for ; Mon, 5 Aug 2024 14:43:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bisson.gary@gmail.com Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-6bb84ac8facso28757496d6.1 for ; Mon, 05 Aug 2024 05:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722861816; x=1723466616; darn=lists.denx.de; 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=mDz3/zWh7t59HevhVq+1h+sStqoc9Wi8qXh3yAn2l8w=; b=LNgry+hkBAi0MKmvpRhyEM9JBxY4C1bxF18VvI7BZGcZYE0s88hf23SD/M8mqCs5IM Alq4WMvvVXX9tjGcwROPVmKtLgUa5NhjT5dxFUTVhi1sDnZ1SPg0ri5O1ZYYyekofdFv vS1qRmzU2CZZX1oLspfdSqQcwz7oLzRDC9l3z7NHDr0JGeUwXnfjBUwlqtvYxVlsVPMP /B7ks3Dr17Y0i1Q2/NztCD8VvwWh1gOtx+qabqs5d/8ZPsnFExoORMuqDDtDKnIKgSMZ 8womTBOZZUnhAShxHaJV6opVJppzzo9uAWHVs1/bdHTcgCFWms8cVGDnjhqyuPX+crlJ dx/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722861816; x=1723466616; 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=mDz3/zWh7t59HevhVq+1h+sStqoc9Wi8qXh3yAn2l8w=; b=CR18LqRfLfJQpfUsR2h+G6xMldahzZ2vHtqjkw4yGNbl4SxumX/aPBZf/zuMQ8UDVl 9naATrvug7FEc7MUVhybZ8UogcUKUp4EHSRZU2nrhtREyHK6uCtLYF0tgxyJ2eYh3IRq vI/x1oAZoUjvkzuH9KO2NDzVewqqU7tZceTFcKVsZCX4y0BHtODfgg8Yz4lzjofSsHWt RAIgXVxQdopRIwG3ZCyo1LQbdju9tmj4gF6Twiq7IDP6sUtss8NaZdrq+vXIRiYE5Ti3 C8rHu+hqTsGmSoLepv00wj8Wl52rVMgizxv6xGbLky0NSvNETw/8WGYEDYv/deZc69qD 2s5A== X-Gm-Message-State: AOJu0YyhcXUcN2ZguP9i50Uf5MzgeCY0kCx2DWvVAncw+bYf94zY5CBa +ZqGLaBKKxvPts+c1/tCECP1dTUfO8ljhImCObkHq+JjW5bZgUD8YIrxkQ== X-Google-Smtp-Source: AGHT+IHSwqfh1m2AB+69ADQV8Sa5yQpEjTAycI2nvVxHjPPBUHBdUH52ClocW7hD9WX8CptXG4Z5GA== X-Received: by 2002:a05:6214:310f:b0:6b5:e97b:bdce with SMTP id 6a1803df08f44-6bb983d6ecemr108205226d6.22.1722861816096; Mon, 05 Aug 2024 05:43:36 -0700 (PDT) Received: from p1g2.lan (128-78-204-97.abo.bbox.fr. [128.78.204.97]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6bb9c87bb90sm34984796d6.130.2024.08.05.05.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 05:43:35 -0700 (PDT) From: Gary Bisson To: u-boot@lists.denx.de Cc: trini@konsulko.com, festevam@gmail.com, peng.fan@nxp.com, uboot-imx@nxp.com, Gary Bisson Subject: [PATCH 4/5] mach-imx: Add i.MX 8ULP binman support Date: Mon, 5 Aug 2024 14:43:25 +0200 Message-ID: <20240805124326.544310-5-bisson.gary@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240805124326.544310-1-bisson.gary@gmail.com> References: <20240805124326.544310-1-bisson.gary@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 05 Aug 2024 15:54:59 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean - Re-use i.MX 93 Makefile target as similar boot process - Create imx8ulp-u-boot.dtsi for binman image architecture - Create both SPL and U-Boot containers configuration Key differences between the 93 and 8ULP SPL container are: - No LPDDR training library needed for 8ULP - 8ULP requires a uPower binary (RISC-V core) for power management - 8ULP also requires a M33 binary to work properly Signed-off-by: Gary Bisson Reviewed-by: Peng Fan --- arch/arm/dts/imx8ulp-u-boot.dtsi | 63 +++++++++++++++++++++++++ arch/arm/mach-imx/Makefile | 4 +- arch/arm/mach-imx/imx8ulp/container.cfg | 7 +++ arch/arm/mach-imx/imx8ulp/imximage.cfg | 9 ++++ 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx8ulp-u-boot.dtsi create mode 100644 arch/arm/mach-imx/imx8ulp/container.cfg create mode 100644 arch/arm/mach-imx/imx8ulp/imximage.cfg diff --git a/arch/arm/dts/imx8ulp-u-boot.dtsi b/arch/arm/dts/imx8ulp-u-boot.dtsi new file mode 100644 index 00000000000..30baaeff8ef --- /dev/null +++ b/arch/arm/dts/imx8ulp-u-boot.dtsi @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#ifdef CONFIG_BINMAN +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-spl-ddr { + align = <4>; + align-size = <4>; + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + + u-boot-spl { + align-end = <4>; + filename = "u-boot-spl.bin"; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x22020000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + u-boot-container { + filename = "u-boot-container.bin"; + + mkimage { + args = "-n u-boot-container.cfgout -T imx8image -e 0x0"; + + blob { + filename = "u-boot.bin"; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl: blob-ext@1 { + filename = "spl.bin"; + offset = <0x0>; + align-size = <0x400>; + align = <0x400>; + }; + + uboot: blob-ext@2 { + filename = "u-boot-container.bin"; + }; + }; +}; +#endif diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index ef0caed3f7f..b311d176d64 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -129,7 +129,7 @@ DEPFILE_EXISTS := $(shell $(CPP) $(cpp_flags) -x c -o u-boot-dtb.cfgout $(srctre else ifeq ($(CONFIG_ARCH_IMX8M), y) IMAGE_TYPE := imx8mimage DEPFILE_EXISTS := 0 -else ifeq ($(CONFIG_ARCH_IMX9), y) +else ifeq ($(CONFIG_ARCH_IMX9)$(CONFIG_ARCH_IMX8ULP), y) IMAGE_TYPE := imx8image DEPFILE_EXISTS := 0 else @@ -215,7 +215,7 @@ flash.bin: spl/u-boot-spl.bin FORCE endif endif -ifeq ($(CONFIG_ARCH_IMX9), y) +ifeq ($(CONFIG_ARCH_IMX9)$(CONFIG_ARCH_IMX8ULP), y) quiet_cmd_imx9_check = CHECK $@ cmd_imx9_check = $(srctree)/tools/imx9_image.sh $@ diff --git a/arch/arm/mach-imx/imx8ulp/container.cfg b/arch/arm/mach-imx/imx8ulp/container.cfg new file mode 100644 index 00000000000..029b79128c8 --- /dev/null +++ b/arch/arm/mach-imx/imx8ulp/container.cfg @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +BOOT_FROM SD 0x400 +SOC_TYPE ULP +CONTAINER +IMAGE A35 bl31.bin 0x20040000 +IMAGE A35 u-boot.bin CONFIG_TEXT_BASE diff --git a/arch/arm/mach-imx/imx8ulp/imximage.cfg b/arch/arm/mach-imx/imx8ulp/imximage.cfg new file mode 100644 index 00000000000..a55359fee23 --- /dev/null +++ b/arch/arm/mach-imx/imx8ulp/imximage.cfg @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +BOOT_FROM SD 0x400 +SOC_TYPE ULP +APPEND mx8ulpa2-ahab-container.img +CONTAINER +IMAGE PWR upower.bin +IMAGE M40 m33_image.bin 0x1ffc2000 +IMAGE A35 u-boot-spl-ddr.bin 0x22020000