From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 01 Apr 2025 13:09:01 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tzZUL-006y0i-1g for lore@lore.pengutronix.de; Tue, 01 Apr 2025 13:09:01 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tzZUL-0004SF-00 for lore@pengutronix.de; Tue, 01 Apr 2025 13:09:01 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Z81wIDaC89UDo1JyjPQPHXzMLG9LQIm3dp2LGqdvtpU=; b=viGEc/DwS9MisCjPUeWyWqhZOz 9t1bg/KMcuZoxlMCZvhvBwrSwW35eAmQmqAydMA2+UeVYlyiwaeDssjdjQ3tdSVd/GOz47jzLBqpu Q8hX8IAwM4jX2gRI0GiqClcOY0kYUjGaZq8QCaG656eTN19Aq5UsV3ITkUARGYyiW7RwTYUWRXLaD Jy4Zfl+/Kiw9gRVu1MVwQZlSz6fjTg6hEsxyZLoB1vXqVwzmBraC4Jjss371J0J6WrYsC16zWCQcH o32tqBycL0sg4dS6ijLLWB8Q1onu1ths5x9h7rAPYjPQJIJsF76cwGCSlTkdbUem58AK+gh1TZaNs iAkNSDGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1tzZTt-00000002jut-2mln; Tue, 01 Apr 2025 11:08:33 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1tzZQ9-00000002ig4-462D for barebox@lists.infradead.org; Tue, 01 Apr 2025 11:04:44 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tzZQ8-0002Wz-PS; Tue, 01 Apr 2025 13:04:40 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tzZQ8-002kdE-1d; Tue, 01 Apr 2025 13:04:40 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tzZA7-00GcAa-2r; Tue, 01 Apr 2025 12:48:07 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 1 Apr 2025 12:48:06 +0200 Message-Id: <20250401104806.3959859-17-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250401104806.3959859-1-a.fatoum@pengutronix.de> References: <20250401104806.3959859-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250401_040442_321543_5B551258 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 16/16] boot: make bootsource the default boot target if enabled X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) bootsource now expands to the cdev that barebox booted from if that could be determined. This makes it a useful default for $global.boot.default. Signed-off-by: Ahmad Fatoum --- common/boot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/boot.c b/common/boot.c index cb16a9a2b508..6aa2b1394961 100644 --- a/common/boot.c +++ b/common/boot.c @@ -134,7 +134,12 @@ static char *global_user; static int init_boot(void) { - global_boot_default = global_boot_default ? : xstrdup("net"); + if (!global_boot_default) + global_boot_default = xstrdup( + IF_ENABLED(CONFIG_BOOT_DEFAULTS, "bootsource ") + "net" + ); + globalvar_add_simple_string("boot.default", &global_boot_default); globalvar_add_simple_int("boot.watchdog_timeout", &boot_watchdog_timeout, "%u"); -- 2.39.5