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 F19D7C4332F for ; Sun, 6 Nov 2022 22:41:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9515784F13; Sun, 6 Nov 2022 23:40:50 +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="aOCd5qbR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5A3F80705; Sun, 6 Nov 2022 23:40:43 +0100 (CET) Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 DBC8F84D21 for ; Sun, 6 Nov 2022 23:40:40 +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-x12f.google.com with SMTP id l6so5095035ilq.3 for ; Sun, 06 Nov 2022 14:40:40 -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=zkkrHnf0tckI/NzQUs6TsV4h37tj1Q693WNjQQLjNJk=; b=aOCd5qbRgp8r9fgytoVh+Gzz89tdYAJ/DPOYJUpPN4MeAui5Tx4UdXMPMdmTbedyyE 1s7+NNF+fa4U2AqB16RD1THCBkCKQH2TeAhNuXhCH4zQlHgHPjld9rpHtvbvGaFXfVOI W8zNGjdpoBdpliMogdWKe9qz/k03ZFTlqXyXc= 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=zkkrHnf0tckI/NzQUs6TsV4h37tj1Q693WNjQQLjNJk=; b=CzZU37CPgCQ2w8oZAoI8OYfEg6WwsxotAD9JyY/Hr7kejvOyJHnmz5yJSyuxLu2xIw 0THlboDPDPzDWm8XHhtm2g1trGS7jn6lqrgK04jdbNF2Ga3aAVoEdqUsOAy3ovQLeO8X nQIopjRmQEReosn/rwGRVbTgfnf7HdSNUawWBNZ6JeGUH0lEMSnkR3hHoP3Hx7nUI/T+ I+atVvegi9a7aYFl/iJNQDnEHTJ2zoFsyTzWaUosd+w+iMKITCdEhEXyZ3UwwABt2isZ uUu/MABPJrQ2ImW7Y+DPNU/N7hSE6h9jJvkIsvjZywRO+QW8i/vIAgZrRslceFsX7zHs z3SQ== X-Gm-Message-State: ACrzQf1hkj/87f6eQj4a5ZrBGa1Mtu410w1GnFQNJG0oTGve9gwA+N9d 2+aCP7fPaA8QNJbZqdEYSRCev3quKi6KFw== X-Google-Smtp-Source: AMsMyM6N9bySoxJ5uJsJEx7oxespSGxMH4en85W+A1o9qfH8AfDJfmptC3oiKPl/rFL4WRfpAx+ahA== X-Received: by 2002:a92:d0ca:0:b0:300:a568:6996 with SMTP id y10-20020a92d0ca000000b00300a5686996mr13155674ila.244.1667774439266; Sun, 06 Nov 2022 14:40:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Nov 2022 14:40:38 -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 , Andre Przywara , Heinrich Schuchardt , =?UTF-8?q?Marek=20Beh=C3=BAn?= , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Quentin Schulz Subject: [PATCH v4 5/7] rockchip: Convert all boards to use binman Date: Sun, 6 Nov 2022 15:40:08 -0700 Message-Id: <20221106224011.606743-6-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 Instead of the bash script, use binman to generate the FIT for arm64. For 32-bit boards, use binman for all images, dropping the intermediate files. With this change, only Zynq is now using SPL_FIT_GENERATOR so update the Kconfig rule accordingly. Clean up the Makefile to the extent possible. Unfortunately, two boards do not use SPL_FRAMEWORK so don't enable the u-boot.img rule: evb-rk3036 kylin-rk3036 So a small remnant remains. Signed-off-by: Simon Glass --- (no changes since v1) Makefile | 8 +------- boot/Kconfig | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d5c2c970092..fda9cd2c889 100644 --- a/Makefile +++ b/Makefile @@ -1004,14 +1004,9 @@ ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy) INPUTS-y += init_sp_bss_offset_check endif -ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy) -# Binman image dependencies -ifeq ($(CONFIG_ARM64),y) -INPUTS-y += u-boot.itb -else +ifeq ($(CONFIG_ARCH_ROCKCHIP)_$(CONFIG_SPL_FRAMEWORK),y_) INPUTS-y += u-boot.img endif -endif INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \ $(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \ @@ -1486,7 +1481,6 @@ OBJCOPYFLAGS_u-boot-with-spl.bin = -I binary -O binary \ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE $(call if_changed,pad_cat) - ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) diff --git a/boot/Kconfig b/boot/Kconfig index d5c582ebe8c..a01aedd8a57 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -277,7 +277,7 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT && (!ARCH_SUNXI && !RISCV) + default y if SPL_FIT && ARCH_ZYNQMP config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" -- 2.38.1.431.g37b22c650d-goog