From patchwork Tue Jul 2 13:38:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3646 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Jul 2024 15:38:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f186.google.com (mail-lj1-f186.google.com [209.85.208.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dcgdi029434 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:38:43 +0200 Received: by mail-lj1-f186.google.com with SMTP id 38308e7fff4ca-2ec67e2be29sf9319521fa.1 for ; Tue, 02 Jul 2024 06:38:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927515; cv=pass; d=google.com; s=arc-20160816; b=QDUz/d3B9ErDvSRkK9F/7Vlim9sgh/hfyfgaaqlMu0ow65BKRXTPPLM9o550fMaVPw yi6vjrOKq1LEA7DTyLqc/sRkPcM6f3Af8jOIf4PKre9Dhipnpvz93NABYBykNo1u//Pt 6s/QucMeZ0dlDFoRJLIluF16iMBRVYAmRFiBJvA+wUd8bPGRgTYICT96WSarwoWImpLy pqfbNLMcE7tfY30zx0cuGaAH4zZjjiL1EhumQL2f6uejWVJbVHbvMa4wCkIconiPhhzb LKmP4GzTj9+nZD3A5wRwejb5D7GgB4JaXsKLnyxBXVyyaRK7eB7OOa1EJvrBPkuFr+1i dQQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=B3ziOkbpWJAEro3Ad5ApHlF6SA1hNA4jnpxjWaCDY6c=; fh=Q/aTBBotjuAm/dRm/JMO2Qr4F8SotmQdfAuUjj6ad04=; b=XOhGCxHUAmyn2aGWfNJyiIdUDOOt8NRpGQ0Hx8U1XxkGk5tZiHgTbSdkiW4z4XsR0v AM2bOkQDncY5i+eBFmMhw9MPIUNIlfU86hnfVGh2vlx+W8QV6dpUSZ1Xz9cCR1/3iCPN WAJZBGEZ0hYQnluJ5qG1Ngi3HxNn/+06Lvf/OJzowQYj5IEAxzjlmb2TLYQPq/I0LAhK 244qosY0D2Ls8HBXeferSvzyNGBG0IhhlQmBKbgJKv8kvnHZ9HwzTSobu/5kWV+0OsMZ y12j1k/TzObDRC7kOv6RcY+k8kUPnfylcJ4rPHgqMypLm/IJhgtbK+jJbxf7E6xqLrVQ VLzg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IDRmnSV1; spf=pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338326e63243ff5648cf4ba-gVOMG8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1719927515; x=1720532315; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=B3ziOkbpWJAEro3Ad5ApHlF6SA1hNA4jnpxjWaCDY6c=; b=c+reiGoCbjj7jSH6jH72T64hAnG8ktekOY/3v0nNW2qugLglwuobIHX9muA7MXLAut jUJYIpRj9e6o0xqbW6L22PRsRwh/WOWITXI/PfuJ0OUZenOils4bw6MoFWv3EbxJQTro mq5WtxdEehS62VYaeIt3ZX8qQr2llzFzCufTpw6Zbb1dAXGg8tHP7d+J5pZbicjZeekd aRlnjPicwdRidebsl2Kp/VZJmdU2oRICuquNT6eihKad7ZQ9m08MKBE8diAiKmZt4zxK O0TDV4EeEDiczy/xtHYesNp9cZ0NUqo32nL3Og/jp7YcstaJ3uHAYE3Yklo8mwfFuKB2 3SAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927515; x=1720532315; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=B3ziOkbpWJAEro3Ad5ApHlF6SA1hNA4jnpxjWaCDY6c=; b=BRYT3GzU3mcKvhvw2TZWuvnM/SEkaHFcveE4WmO55yp3zRUVZ+rUXT7j4O5ULKSP1y flGb876ptOE15C6DvrQKEl6tn2mbRJvwd5b6q7Nxntm0QukYiIvJ9Mwh50xOnyGqz8vq y2yl5A4xtexQTNYPpdgLfQT/DbSNe5AGJ4SZZ274VSlMQWmbkGFltezuNowylCduKZKq IQ3F+sKqwgb0dWmok1LyE1Dzkqvkj+WJ4E6nCZDmzEbOvepsSgcUib4JecONLfe89gmZ 335/OMLZvnAYRo0cvDSDyFsFkWLAwihKe4DNR8SivRNbcNhdSysK86BGPqg8GHhuL61D qzJw== X-Forwarded-Encrypted: i=2; AJvYcCVY6CCmSdGmI/87Tq2cFZ356KaXpT//TBesN5QkbhIY3+Biv3B88SPRojsSyuYbUvgCYHqEs///gNvnAbn0DZlcu6peGxE= X-Gm-Message-State: AOJu0Yy/k1rQpy67W2td+bVgx6xeIsGo+lnV5uNi6xrep/m6wmLzQpzg iE9ofsQMZ+qNJqz1fp3ggHWLsQavbupvF/ItVl4AznbG+fEZHrGE X-Google-Smtp-Source: AGHT+IEP2u5sKD1/5JYejKygxtL4O6ngdFbQUT4lzyZmtrq+9IoCsde0wxwDEJ/M6EnaNB3m5HYKUA== X-Received: by 2002:a05:6512:3e09:b0:52c:d805:e8c9 with SMTP id 2adb3069b0e04-52e825ccc3amr5347204e87.0.1719927514948; Tue, 02 Jul 2024 06:38:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b22:b0:52c:e3d2:83c3 with SMTP id 2adb3069b0e04-52e7b4babecls1083241e87.0.-pod-prod-07-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:6512:3b83:b0:52c:d750:bd19 with SMTP id 2adb3069b0e04-52e82646e48mr6595512e87.8.1719927512716; Tue, 02 Jul 2024 06:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=uL2gEmy9Vs76O+tryijC+j8ckxYCcMB4WYtILFOkok3RfmSnDbMgY1kpaHe4nyTZ48 1Q5HgUDUEQPuyBrskQVFWCh5au8vND9T3iVm5xa5Tsb1P3k90NG+YYeBCoS7MIBTTDl0 ROG/emSr6lnRfyWEknuEy9KDyLGoDhnK6jBAI2vCIPZEu/pRUKfFDnkd4iP7lJGzyd1b aVRJJOVcyyQ689B+v3SyVgBwppuOiOMLfqBH0u4XClj51TuQC0A89rRqkmD6mz7fFaE7 f439GofezGlaHoZaWa3dg30JrW9dP3Ig4gy1WD/QHZYflDpJpXLSJ4NKHQeV/6zUjU0T sWrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=AH531p2qPfUUUqDGsYrrSD+NiyEo6oZF1oFTnyuKy9I=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=tn/rbNffW+1DE050N0+hNjSxmbGp5YL4voV6VsGD3uh/opS+h+0nfYhBJ8IiH1gdcL jXtM6uEjxlhHt5/9DXIlTyQ/n102J6DZEephuV6fxlV2d3dFoJo1iGb6kau324v2yMRQ 7uliFdblcu/Nb9fLQC6tDrN33SxrSsq12GnA5faN9/VZSD2Cjm2WG/jjax2l2yPFfsqH jiXxpHOWLvMxKdH5fLxVhW7msolLyfWZJcttHXLtHTdtBiXSdlIrRipD4TNiqSyEbb38 pLFByDDNe0itnhZPlWPYDOaE+D5D1Ax9cg1pNekk8/E5vzMdL3kP3fRbSCgFTAQB5Es5 LrvQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IDRmnSV1; spf=pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338326e63243ff5648cf4ba-gVOMG8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42577a0deb0si4303495e9.0.2024.07.02.06.38.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202407021338326e63243ff5648cf4ba for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 01/17] Kconfig: Rework installer image submenu Date: Tue, 2 Jul 2024 15:38:15 +0200 Message-ID: <0bfff32b3a5b866350b7283d6d7125adf51111aa.1719927511.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IDRmnSV1; spf=pass (google.com: domain of fm-294854-202407021338326e63243ff5648cf4ba-gvomg8@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-202407021338326e63243ff5648cf4ba-gVOMG8@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Even though kas processes it, "menuconfig" is not a valid entry for a choice. While fixing this, also make the installer payload a choice, rather than a string input, to make it easier for users. Signed-off-by: Jan Kiszka --- kas/image/Kconfig | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/kas/image/Kconfig b/kas/image/Kconfig index 45611c4e..e4f64dcc 100644 --- a/kas/image/Kconfig +++ b/kas/image/Kconfig @@ -30,24 +30,45 @@ config IMAGE_CI This image includes is for running CI. Via isar-ci-ssh-setup recipe. It creates ci user with non-interactive ssh access to the board. -menuconfig IMAGE_INSTALLER +config IMAGE_INSTALLER bool "Installer image" help This image contains a target image and scripts to install the target image on a device. -config INSTALLER_TARGET_IMAGE - string "Install Base or Debug image" - default "isar-image-base" +endchoice + +if IMAGE_INSTALLER + +choice + prompt "Image to install" + default INSTALL_IMAGE_BASE + +config INSTALL_IMAGE_BASE + bool "Base image" help - This selects the target image of the installer: - - isar-image-base - - isar-image-debug - If left empty it will generate a installer image without payload. - The user of that image needs then to copy a image to the partition - labeled INSTALLDATA. - depends on IMAGE_INSTALLER + Embed the basic Isar image into the installer image. + +config INSTALL_IMAGE_DEBUG + bool "Debug image" + help + Embed the Isar debug image into the installer image. + +config INSTALL_EMPTY + bool "No installer payload" + help + This will generate a installer image without payload. The user of + that image needs then to copy a image to the partition labeled + INSTALLDATA. + endchoice +config INSTALLER_TARGET_IMAGE + string + default "isar-image-base" if INSTALL_IMAGE_BASE + default "isar-image-base" if INSTALL_IMAGE_DEBUG + +endif + config KAS_INCLUDE_IMAGE string default "kas/image/isar-image-base.yaml" if IMAGE_BASE