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 B053FC54EBC for ; Sat, 7 Jan 2023 21:10:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F91F8560F; Sat, 7 Jan 2023 22:08:44 +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="IR75dovJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B795F85494; Sat, 7 Jan 2023 22:08:02 +0100 (CET) Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 5993D8559E for ; Sat, 7 Jan 2023 22:07:43 +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-x135.google.com with SMTP id y2so2813291ily.5 for ; Sat, 07 Jan 2023 13:07:43 -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=UDVGMan8bUIK3EfQPGVxyWl5ue6KTY0vTnY/CoTc85Q=; b=IR75dovJskdYNdKT72cqEq32pKvb+3CNJ4c/vkNUNoeshaZzR6okmV5uIgYoYJwKeu 2OqHhSVfQWjfwrxi4wwhjXY5w8+OWyyPxjCaJ0+oh5GAtzmQqThOMv+1dEAgYBUDTnq5 AnUMc278Mp99yUs0VRfwhdY5YpskJU4U5ztcA= 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=UDVGMan8bUIK3EfQPGVxyWl5ue6KTY0vTnY/CoTc85Q=; b=PFQVIF2Hjf54hwxi/KavPf+ktMivF7LIKKhf/uNAO7eS6q8IcPcGPkJbDsRu3+Zw0E JHnICL8NeLkbjIoxEZCA0j6K8sF+LTWI8s3VfJbVLCAghVNtCttyF9BEWtOZVdW/5Rhn cFTIhmbFNGE92V6DxGWHOIp1k6JTHbvgPAFq/8bn04HZAp/cEB+xkJv1yAy1FW43+IJo 6oJq/TfLRU3N0qYyaN2MxQiQ/aBO9ihclP7HfsHvFhnWZ/VbUnnpK6RLr+Z16EaHrkQe pQgSp3Ro4rrvbSyAEYrwq62wc+LuN65BsSpl9fjQbYObFwS9BzEFpoWyiZpjk14k2FZe Xidg== X-Gm-Message-State: AFqh2krRc7f3GWIyh5ErK3W6l/u/TuGUi6CLsJ9rV5LEJ2+PZZA0/8ry DYNm3MZt32OwUEQ0dB7OA5pvNZOSE79FFApX X-Google-Smtp-Source: AMrXdXtxA/VOMrhUre1wZ6IWAvA9qSAWpx5eFkgla+pyBiO1GTLDMvbb7KZFjfsrLf+tssDRleVmbg== X-Received: by 2002:a05:6e02:58f:b0:30b:e9d8:155 with SMTP id c15-20020a056e02058f00b0030be9d80155mr34783600ils.9.1673125662720; Sat, 07 Jan 2023 13:07:42 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-71-56-217-229.hsd1.co.comcast.net. [71.56.217.229]) by smtp.gmail.com with ESMTPSA id l10-20020a92d94a000000b0030c00897497sm1465825ilq.19.2023.01.07.13.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 13:07:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Roger Quadros , Tom Rini , Alper Nebi Yasak , Peter Geis , Jerome Forissier , huang lin , Jeffy Chen , Simon Glass , Kever Yang , Philipp Tomsich , Ivan Mikhaylov , Quentin Schulz , Philippe Reynes Subject: [PATCH v9 12/14] rockchip: Convert all boards to use binman Date: Sat, 7 Jan 2023 14:07:19 -0700 Message-Id: <20230107210721.478062-13-sjg@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230107210721.478062-1-sjg@chromium.org> References: <20230107210721.478062-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 5610f7b4924..a9e89927372 100644 --- a/Makefile +++ b/Makefile @@ -1006,14 +1006,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) \ @@ -1477,7 +1472,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 65613a01491..7708d83e7d1 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -282,7 +282,7 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" depends on SPL_FIT - default y if !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.39.0.314.g84b9a713c41-goog