From patchwork Wed Oct 4 08:07:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1843036 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=mf50Wkhe; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33e; helo=mail-wm1-x33e.google.com; envelope-from=swupdate+bncbaabbqn26suamgqeww67ixq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-wm1-x33e.google.com (mail-wm1-x33e.google.com [IPv6:2a00:1450:4864:20::33e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S0nNl2CNdz1ypx for ; Wed, 4 Oct 2023 19:07:35 +1100 (AEDT) Received: by mail-wm1-x33e.google.com with SMTP id 5b1f17b1804b1-4030ae94fedsf13286435e9.1 for ; Wed, 04 Oct 2023 01:07:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1696406851; cv=pass; d=google.com; s=arc-20160816; b=cBaFnN1co+AvhSYNLlZmLzhJDQjSaX4u2oKxix32xnhnnZNXGt1gOP/yoRLZEcf9m5 Nt+6DpAABDdc299tWtxltbsX/viMbrxPJ/Sbn2CB8kRX6Q9DSiuw2vH2SNkfbydSoE2s 9v74HQuyHY6GMVs40gaMGKsvjztTnI54RRmnIwF4yjejdiH1X6jAf5rSaCoKQqqm159K aSVdD3LACF1TkKqad12dBU+cCLeaVIqfF7ZUr1EDXmAPDc7ZWHPwMM/R+4LGY6ru2cO7 XS/n4ulDjCKfd7p8yZy75tC+zu+pZgeFtl0FSqI0D50vHSnCoLBt2bSU4ntjBPPvKbtz b0TQ== 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:ui-outboundreport:mime-version :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Kf7dMHYd04Lox41J6IDy+L7syNV+7k52zWWHX6B61p0=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=p2PzxQKNnemeXymK52NrqyXRtg1HVxrYgkUXuxwaPnO78BdfRvM8gaEBnaes8LiBHS nyuCWtWNjwvfCRe0kb6MRL01dAa41F3pOiRUi423q/Pk86u6SZdlLxqJKnROiZs/p/pp E/gc+PXA1d0NYdR3BcyFU40DDUopzmyXiKgxjmBRVZihkjG+TORWUUPw/to2vuszNJL0 yhm9mWA+RypLcFJLlM2+6dcSH7Xtx5gmDJ2Cxy9yFlQsku+6VPcClrkOeBrr4uUi26Bv E9529egUjEKk4vxKyQoLUv84gIwH/ZZ7wBJIWlzfeyTnfq/lOzJV8a/sYcQDV9d3BIg+ 5HUA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1696406851; x=1697011651; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:message-id:date :subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Kf7dMHYd04Lox41J6IDy+L7syNV+7k52zWWHX6B61p0=; b=mf50Wkhenq4fExMrNYqBub7BH1rGDxY7Lj/4ZgxwigQ13IASeMIYaLA9d1n0NfQbCJ A/8WbTkxeXaNrhKYRzAKgI41KptCbtagXDCIjKT6V2hzCJbEYLwIykN8fGyoqHSdWChq SsaZiJLr17JyfaMyO1jIEJdSOw5W0l+qHsQhooh3+hVkfokvKPAhzy2L2CYUmvVehcMj oq5s7OkfQgyVQaGqdLs8k1TGuePlDNQCMfv2TUYYqEFEmkMoXFm7AwLjnDYn2/6Yg9tj POii/UF6ZMEYb0jnxgqeKcMo0ymRONP4GMo5QZZRaQWCJI7zbwB/eALi7UiNTF7ITuGs dTfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696406851; x=1697011651; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=Kf7dMHYd04Lox41J6IDy+L7syNV+7k52zWWHX6B61p0=; b=BVlp8/zePrdgiFla9yUQNmdUVI+H9OIoyg4Cj4v2cfvtdBLMthYdl3edkvj31LZaTl hq5LmpXHwXx6OGcUqThhgrJTFRwDPZIO0DhErlJOQgIkQpRNFKnIZiNrnVIQOos5AFjE bxnQS0ywev5mZuQZTxCtKxD0z98WChiz9YUavLA8BLRZdTaZccRPZd4Krx9T+BRzF3zL CpIGRGsVnjvilYPmrfpu1yD7Hcn1H/nJKPR7sGOyEbNamNUU7id/OKkQqgYlTuS6dOZO QQmS9fTFf4fNqmWgpIKGpP709UPNZFzQIMYehPsCcXJVJBtTpTo19aOF09AkuPF7OfwE y1XA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YzIvyiFDBm97a1/adWiT9lTXOXfWswT7LADHKFhJ6CyPJVLLe5G 7VaxErrvz/QJNWDMMpl1LCo= X-Google-Smtp-Source: AGHT+IG89cqAjX4hkqaLUv91Ahp1MmHJEdcstGeE20uulE/a0Sjhxe8+1dkO7PetmPSbDB86e5qz3w== X-Received: by 2002:a05:600c:2946:b0:405:4daa:6e3d with SMTP id n6-20020a05600c294600b004054daa6e3dmr1493543wmd.39.1696406850206; Wed, 04 Oct 2023 01:07:30 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:3b90:b0:405:349c:902b with SMTP id n16-20020a05600c3b9000b00405349c902bls587877wms.0.-pod-prod-01-eu; Wed, 04 Oct 2023 01:07:28 -0700 (PDT) X-Received: by 2002:a05:600c:211:b0:401:bf56:8ba6 with SMTP id 17-20020a05600c021100b00401bf568ba6mr1545597wmi.28.1696406848492; Wed, 04 Oct 2023 01:07:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696406848; cv=none; d=google.com; s=arc-20160816; b=CWhdvLnxYR2tRN6uIjY2cHgeI6eUCsrsqTRlWif05HUwPuZOXbC5FpPXJzCBV33ENp UuEc4LJCB7SpB+X52SsfXt+8+lluWFVcEuzw4aYCUMyad4jKiieNqbsy5c12JWwfsfNd lJi/W3vXBiJz1q+0AUBJ2KvYztUTsdJsjqHP9OzswrK1ko/LZ8k1JRYu/80HtcoHwAGJ EE3V+FwGVMkESw6fnmWS8NZpvNSawuh7VrwDeZHLfX+CQnpP/kbRxqu0t1gsXW4lUhEk 8vCNgtP0hMGGsc2TFCaPI4Pi0t+pRf01fKQEeyIirzOk0QX34zxRD4tlIBIaKz203g0o 5TGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:message-id :date:subject:cc:to:from; bh=/rVoeSJK8X39Zu9tbzpKqd6qNpkX4tpp+rU0AiUtJ3c=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=07nIPwV+ZYOnhBAm8DxvN1a3dS4ZpAc3TVYgBn1+Yc4EKcZ0FHPb+QLz2nT4qdmezk gjtagZiJJRpLccW6AHoWY+EvikYVrqugJeX4GSUFdEarap5lKB0ElNff7dp4qmLY7U1d xMXdEsYxKKKcPNrdxxlAml8AUQMxymQKoaE3A9DOtPxGsYptUhkv9fqaUlYrAWRl9Fc3 A7IM1wJA0YnRnOuA9J38SiF0x6/pZVp4Do+AhcCcd480+qEQO9ur4MhFCB+rzbwcYLzR ei/G5CNOfH25J6FfA6kXSEcsyoxu37aWHf/N761cNlFZ90nstD4lsoKuKyQZDMqHAm/c 94uQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.17.24]) by gmr-mx.google.com with ESMTPS id e9-20020a05600c4e4900b0040476a42269si59024wmq.2.2023.10.04.01.07.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 01:07:28 -0700 (PDT) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) client-ip=212.227.17.24; Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MV6G0-1rDtlW0KbW-00S3Js; Wed, 04 Oct 2023 10:07:28 +0200 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH] libubootenv: support newer yaml config Date: Wed, 4 Oct 2023 10:07:25 +0200 Message-Id: <20231004080725.16575-1-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:3kFNPb1G155oVtfn5jrAB7vgFrbPUg2ECCvB7BR9ldb3MyBp0d5 m46ay87jD77fMb3MOAO8cpc3T5+XY05xqIEhdh5XywuQcEcMN0lYVCrfjmaa7OulKh3hCxO qxBaExhSkSoAwDmUHvi67rgeuAGT89w5Yan6iX/91WRGvbrYc2zQNEV+YdTokR609CHvzFD bVSJ76uyGeLlMTWZzXeZw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:ABmREZgdLj0=;Hu+yFaB2JsNJYZgoAyH1XU9Swuw Y5m2iqG3ScfPtE8L1yxLFi5pMCZHDGZ4LhLYXDmyiFCNtHI1OL7OJxVl6+n1KZolprVp6j/le ltYw3FfMZZ4ED0oBRcpE69Ly7kssM5SPjnXoTFQUrXiQJn9zvaNF/Qfz/YnfdBxJ5tlh1EO2e zi1i0ChG3UBRye/DAxiCBhOW9LF78ZiqdhOG4E5L2C6RfKsQHL/TfwaUPPApAANwVN489A4qs fuJvcgSOdbxkR1aX48H8bRWNTl2UxR+IQSLHr+CuC8XTXdcr9CP7b08goTMnt0e8A5Q/pbp+L BBykUPvwxT467LZ5kgoayI8SdoNdAKbS5hAxCvMADo21YuWAkFbVtxEMu2loy75OCHZ7qv/mc sEnld75DYZKfTGk/Cq5DRR/SeFp3nC0wro6dPZD1XoHoqkXSjjykze2gz9181XlSF8El8GqXM wexYvaV0s+EaUbrldYCLCqM91NbH5qpfRU1rC38P6KyYK4DO8Z9dX0lrJ7aDW/5ld65SCHsSb 76k8GDbRB1aLrYgQ0jkxeNQUdWQ2+A3h+zV6H0O7HC3+tLPmj8uEJKNleVhiGS48mOMAcP+fM VTQCF4BEVhoJNwLWjrFrJ98E3NVkkgNX3NnXArj9hoJHvlqugS3RjafmTmEj2SCL9Kk0brGby oF3nPCzE76OeK3lqj/Xm3jqJit4Yb7j0qknZfbAVpllcPyKVFVaokqdK9nyDGbxM9Vo9a3GDl N7IKpxqJ4NivDTBo+Wfu5poWc05DP35V6FeuSK+jITIpcp62Zj6KNl1yfBYwd7iYrn3AHiQVw 4lhbK85PvByocYzdymXx1ls9SNJLDIGI8Q5zqlqe2RBK1M3e93bZ0f3eCvFuEUpq3whszlyNj 9ZRxeGSt4N/dF/T7F7ul5zHrX8SEE0FfhC3A= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.17.24 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , libubootenv supports now a configuartion file in YAML. Adjust initialization to support the new format that requires a different initialization. This is also a preparation to full support libubootenv's namespaces in SWUpdate and to have a persistent area for variables handled by SWUpdate but not by the bootloader. Signed-off-by: Stefano Babic --- bootloader/uboot.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/bootloader/uboot.c b/bootloader/uboot.c index a2f07948..7fd47ac7 100644 --- a/bootloader/uboot.c +++ b/bootloader/uboot.c @@ -39,14 +39,20 @@ static struct { static int bootloader_initialize(struct uboot_ctx **ctx) { - if (libuboot.initialize(ctx, NULL) < 0) { - ERROR("Error: environment not initialized"); - return -ENODEV; - } - if (libuboot.read_config(*ctx, CONFIG_UBOOT_FWENV) < 0) { - ERROR("Configuration file %s wrong or corrupted", CONFIG_UBOOT_FWENV); + int ret; + const char *namespace = NULL; + + ret = libuboot_read_config_ext(ctx, CONFIG_UBOOT_FWENV); + if (ret) { + ERROR("Cannot initialize environment from %s", CONFIG_UBOOT_FWENV); return -EINVAL; } + + namespace = libuboot_namespace_from_dt(); + + if (namespace) + *ctx = libuboot_get_namespace(*ctx, namespace); + if (libuboot.open(*ctx) < 0) { WARN("Cannot read environment, using default"); if (libuboot.load_file(*ctx, CONFIG_UBOOT_DEFAULTENV) < 0) {