Message ID | 20221217212813.89914-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=M2TqGXwm; 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 4NZJz039Tmz240F for <incoming@patchwork.ozlabs.org>; Sun, 18 Dec 2022 08:30:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7CC74853B9; Sat, 17 Dec 2022 22:28:48 +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="M2TqGXwm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB15485396; Sat, 17 Dec 2022 22:28:32 +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-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 CF6078538A for <u-boot@lists.denx.de>; Sat, 17 Dec 2022 22:28:29 +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-xd32.google.com with SMTP id h6so2943308iof.9 for <u-boot@lists.denx.de>; Sat, 17 Dec 2022 13:28:29 -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=M2TqGXwmsaxVCVo1htmY3RFhvNY+0ksouVDWlCZyMTIJ9MpZCwuxb9Fy2POrgWYAy4 ou07nL8IBNJcTmpQ2ZuaGrzBkHyVc4dfTwdKVl+jbmI/n4sGR+fK4II2457A9ouB/ALj ru6PVawusgNgIKg/dfd/td8bRFYje83kIdtFw= 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=jugM+zepQifhTCP9SBQw/+qRoPcVz7fXYGgns0J6JIRh+UkpnzCBXt0kjGz/8gadcs EC3lBtF2PW516GTm85L57ibcE0jV+Sy+ncZ7rLHpQlMIMPHT6hXJZi9TJFUNrpNEJOqB 1Oc2UaV/e0VmzLaEFEDmdEqaVXJn+ca9v4qKjDvzK7IQonv6j4MNYwSBkeQkZcKtEIcr +75uBnR/a/VaCJXBs90JNGiBmO5zSOfiu4bP7XwQa2paBtZu/9ku0g5XuI03JsnVZSKX NsOmZXLhV+9iLIFv1DhawZq1ZBHTJ4PRxhUVZ8+h5Dq92KmPSZTDYVq4to7xE/EvHhmo s2iw== X-Gm-Message-State: ANoB5pmr9w4sRXxT0jsMRgPAnyUcuK9PHkyxMyrLSgws/dTUhzXjWjFt T/vkWgApH6vMIIt2R4eodOkfjxHvXirmSL9f X-Google-Smtp-Source: AA0mqf7JFW2Dti+BHkM1NOBfsEgyLGDy23xklP0oXo+jg7aLosfOEVfHY3TOlsqQTiHR5F6cWCESQQ== X-Received: by 2002:a5e:d819:0:b0:6df:df5b:f86 with SMTP id l25-20020a5ed819000000b006dfdf5b0f86mr20359145iok.8.1671312508163; Sat, 17 Dec 2022 13:28:28 -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 e2-20020a02a502000000b00370decbbff3sm1949886jam.148.2022.12.17.13.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 13:28:27 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: 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>, Peter Geis <pgwipeout@gmail.com>, Quentin Schulz <quentin.schulz@theobroma-systems.com>, Alper Nebi Yasak <alpernebiyasak@gmail.com>, Ivan Mikhaylov <ivan.mikhaylov@siemens.com>, Philippe Reynes <philippe.reynes@softathome.com>, Tom Rini <trini@konsulko.com>, Jerome Forissier <jerome.forissier@linaro.org>, Roger Quadros <rogerq@ti.com> Subject: [PATCH v7 08/12] rockchip: Use multiple-images for rk3399 Date: Sat, 17 Dec 2022 14:28:09 -0700 Message-Id: <20221217212813.89914-9-sjg@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20221217212813.89914-1-sjg@chromium.org> References: <20221217212813.89914-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(-)