From patchwork Mon Jan 22 11:54:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosh Ganu X-Patchwork-Id: 764633 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp1059545wrx; Mon, 22 Jan 2024 03:57:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFV7C2G57uxgGz8fiZv9IOlW0LbZXzHvVnWTcg3S0Feosxw9lOGfVVVI1HnWw8NZ5UVAB36 X-Received: by 2002:a05:600c:46cc:b0:40d:4933:d946 with SMTP id q12-20020a05600c46cc00b0040d4933d946mr1517086wmo.138.1705924657554; Mon, 22 Jan 2024 03:57:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705924657; cv=none; d=google.com; s=arc-20160816; b=Hzs/SZ7B3QhllzSkfB5Hx6UY9YKEhnIIWXS0oy2fCAaDT+fIwTxarEOKa6+h1/csYy wlS5XWMKmMs6hbQqojlSX7KxI+ClmbKLive2YpzpSps6/JYtnpHD5EVqxkK2qZdoiA5v WhfM0Wzj9EvOtTnrUlt6z+IhBSLLXFNWSTn2aYxONS1Pu45h+jNUMECC+Uwq5C9pF8J4 dD440fqyrJFtHKrW4fzuwLiHYcSM7ghDZ06iKAfBf7mMbbx6iHWTmNoTUx8iHbRTRjK1 6DsMKkxfawruLvyFcaGB3BJp9nNIrO1aVQF9rOEgeo4vEmcv3RxBvmVVt3ysNN/XVvA0 O7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=mttxxuVoOJGPNSJN9ozXbQ2SFyQ1swh7PRUpLutpYIM=; fh=rhmJ78R78zNUSUA9Nt0a5TbZO4CVsI4vi5GcqSIe+nI=; b=0rvvw/k0CV+mx2iiVD7uL8W4p50stsY4RJ7XZoj6r0XiOeOBYkyGViY0FSWC21U2jz WrnXWnhbpJoh4qgzrdESY06FTaQ5LNG9zQFkeSwwtMTRMttjOd4ii5fiEY2CQ+nezPJZ aeum5uodTn9YRCAU0Y5DTnhKCHiNU0fOLHnr9DK4XOUo2s2mOHP89J9RJe/v3Z8sGipO 48LV2pEVuwabL+nIoDBuRtSYBI2K2OP9OvLrIVl83VNhyCeZa8wNCTVJ4skYMe6C3uAw D8D7Iy7cTi1MVDiBUKdIPRN3aHNdFeMV3e1hZ1/WpONkFHAhR6R7+KbhgkrEp3aTrRHU cdhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id p2-20020a05600c430200b0040e4336d21asi12353225wme.207.2024.01.22.03.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 03:57:37 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5B86287C8A; Mon, 22 Jan 2024 12:56:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id D0ECE87CAC; Mon, 22 Jan 2024 12:56:02 +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=-1.2 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_SOFTFAIL,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id C5C77879A0 for ; Mon, 22 Jan 2024 12:55:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sughosh.ganu@linaro.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 516252F4; Mon, 22 Jan 2024 03:56:45 -0800 (PST) Received: from a079122.blr.arm.com (a079122.arm.com [10.162.17.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9C58C3F73F; Mon, 22 Jan 2024 03:55:56 -0800 (PST) From: Sughosh Ganu To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Masahisa Kojima , Patrice Chotard , Patrick Delaunay , Yann Gautier , Etienne Carriere , Sughosh Ganu Subject: [PATCH 15/18] fwu: Remove the config symbols for number of banks and images Date: Mon, 22 Jan 2024 17:24:36 +0530 Message-Id: <20240122115439.653871-16-sughosh.ganu@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122115439.653871-1-sughosh.ganu@linaro.org> References: <20240122115439.653871-1-sughosh.ganu@linaro.org> MIME-Version: 1.0 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 With the migration to the FWU metadata version 2 structure, the values of number of banks and number of images per bank are now obtained from the metadata at runtime. Remove the now superfluous config symbols. Signed-off-by: Sughosh Ganu --- arch/sandbox/Kconfig | 6 ------ board/armltd/corstone1000/corstone1000.c | 2 +- lib/fwu_updates/Kconfig | 11 ----------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 0ce77de2fc..29013a5673 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -79,9 +79,3 @@ config SYS_FDT_LOAD_ADDR See `doc/arch/sandbox.rst` for more information. endmenu - -config FWU_NUM_BANKS - default 2 - -config FWU_NUM_IMAGES_PER_BANK - default 2 diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c index 01c80aaf9d..15de738154 100644 --- a/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c @@ -109,7 +109,7 @@ void fwu_plat_get_bootidx(uint *boot_idx) */ ret = fwu_get_active_index(boot_idx); if (ret < 0) { - *boot_idx = CONFIG_FWU_NUM_BANKS; + *boot_idx = 0; log_err("corstone1000: failed to read active index\n"); } } diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig index d35247d0e5..6bb94f88d3 100644 --- a/lib/fwu_updates/Kconfig +++ b/lib/fwu_updates/Kconfig @@ -12,17 +12,6 @@ menuconfig FWU_MULTI_BANK_UPDATE if FWU_MULTI_BANK_UPDATE -config FWU_NUM_BANKS - int "Number of Banks defined by the platform" - help - Define the number of banks of firmware images on a platform - -config FWU_NUM_IMAGES_PER_BANK - int "Number of firmware images per bank" - help - Define the number of firmware images per bank. This value - should be the same for all the banks. - config FWU_TRIAL_STATE_CNT int "Number of times system boots in Trial State" default 3