From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:6512:10d6:b0:52c:dc57:868b with SMTP id 2adb3069b0e04-52e8264b5bdmr6551593e87.13.1719927515076; Tue, 02 Jul 2024 06:38:35 -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-Google-Smtp-Source: AGHT+IHliZzCBR8vNmL2GlkHcdwgO4SPNaotj2kw5jASe5bj5NNL2rlDvou01LN/nmWmcVhmAhrV 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 Return-Path: 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; 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 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202407021338326e63243ff5648cf4ba for ; Tue, 02 Jul 2024 15:38:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=AH531p2qPfUUUqDGsYrrSD+NiyEo6oZF1oFTnyuKy9I=; b=IDRmnSV1Yka4KHgP5zcvAkG/udyrGHpVySOM5LfsR8wivuO0qrycDhVkDIk5oRU8G/IBko TKG0ib+o20QujqiIFtgJfYzv8f+p3UYojJ0Ulo1AjTzxTWupHz5CKovaG6wa5ZsvhMMq/HOA 9cwXyN+k6qyLwveoxiyqjFMgU2EzM=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: OO/n7VfJrr8j 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 -- 2.43.0