Message ID | 20221217161117.61699-9-sjg@chromium.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=GWeZYn0+; 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 4NZ9xl2JKwz240B for <incoming@patchwork.ozlabs.org>; Sun, 18 Dec 2022 03:13:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 218D1853BE; Sat, 17 Dec 2022 17:12:13 +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="GWeZYn0+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EEBD48538D; Sat, 17 Dec 2022 17:11:58 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) (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 D56CC8537D for <u-boot@lists.denx.de>; Sat, 17 Dec 2022 17:11:55 +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-io1-xd2d.google.com with SMTP id d123so2698226iof.6 for <u-boot@lists.denx.de>; Sat, 17 Dec 2022 08:11:55 -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=8BahDNw9pUEymasQSkladZPv7UNUBAZSBFJSiJGndGA=; b=GWeZYn0+ONFbDHIFlqJHjmsVp4JTBXF4Aug3fkXfsLYGXCqDuL88fGtxEIProf63To fPAN1/XZHOM0gKsH+UCiRW6rnx0NC4kQdXmfZyAOmpyfaOn+V+v2KUnRb4r6q3U12OIt XmfH5LgVEvKlQTF4K55I82CySGjlBN8n7COZE= 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=8BahDNw9pUEymasQSkladZPv7UNUBAZSBFJSiJGndGA=; b=eBl6nR+b0moPMMzrRPUdqw00JXyy2rjI8wkAiA1/LgBxODQ7BMEDCOjqMlDNvOUIE2 jho3LNSgpOtngJ3wGWvT0b6SkXgJJEA4ID56Kem+vqd9vvgujqU/gjnljskmPqSR1BDZ px/8MWKkiGFFLuVhPiPdPhl7/m7vSko8Y52bOInqznFGUzHBEo4ug1giKJT4BBertKTW XHxEmBRdQw6iS9Jvsmxi2yWW5LF9WkB8zHUmWDWOTyrBuW/2nlmvS0TQVYUrbWqKpRGX lP95SCK4BOqtk77e6tXV7UPc1MNYkzDR5iKpL9T0ntqQLgQM349naqJRNHyHQ1BGa0SM 4C1g== X-Gm-Message-State: ANoB5pmlW+kiopk/MMdBaUP0Rm9EUmfmR42Y1PzNd7UNoPnKm13Efrgr tQO63EymxM/KLjs1UjH4LQ83rfetipw9/8re X-Google-Smtp-Source: AA0mqf6WbeWC+wtKhDeanxo2sNG8G6l3X+deupk+xuC88esiIVVGVhYIVJLv5DX2gHQWSk7QycDBOg== X-Received: by 2002:a6b:8b8c:0:b0:6e2:f989:5a8a with SMTP id n134-20020a6b8b8c000000b006e2f9895a8amr15798663iod.11.1671293514322; Sat, 17 Dec 2022 08:11:54 -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 o5-20020a056e02092500b00302f958e71dsm1652817ilt.49.2022.12.17.08.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 08:11:53 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Peter Geis <pgwipeout@gmail.com>, Jerome Forissier <jerome.forissier@linaro.org>, Tom Rini <trini@konsulko.com>, Philippe Reynes <philippe.reynes@softathome.com>, Alper Nebi Yasak <alpernebiyasak@gmail.com>, huang lin <hl@rock-chips.com>, Jeffy Chen <jeffy.chen@rock-chips.com>, Simon Glass <sjg@chromium.org>, Kever Yang <kever.yang@rock-chips.com>, Philipp Tomsich <philipp.tomsich@theobroma-systems.com>, Quentin Schulz <quentin.schulz@theobroma-systems.com>, Ivan Mikhaylov <ivan.mikhaylov@siemens.com>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v6 08/12] rockchip: Use multiple-images for rk3399 Date: Sat, 17 Dec 2022 09:11:13 -0700 Message-Id: <20221217161117.61699-9-sjg@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20221217161117.61699-1-sjg@chromium.org> References: <20221217161117.61699-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script
|
expand
|
diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 3c1a15fe51b..85a4f472d5d 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -62,6 +62,7 @@ #if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM) &binman { + multiple-images; rom { filename = "u-boot.rom"; size = <0x400000>; @@ -82,7 +83,7 @@ }; }; }; -#endif +#endif /* CONFIG_ROCKCHIP_SPI_IMAGE */ &cru { u-boot,dm-pre-reloc;
Enable multiple-images so we can generate more than one image. Also add a comment for the end of the #if block. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v5) Changes in v5: - Rename from 'Include binman script in 64-bit boards' - Drop duplicate #include in rk3368-u-boot.dtsi - Keep the name as fit for puma - Drop redundant check for CONFIG_ROCKCHIP_SPI_IMAGE - Drop imply of BINMAN in Kconfig (rely on ARCH_ROCKCHIP instead) arch/arm/dts/rk3399-u-boot.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)