From patchwork Fri Aug 9 15:38:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ravi Minnikanti X-Patchwork-Id: 1971016 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.a=rsa-sha256 header.s=selector1 header.b=fM6Ede2h; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4WgSkB6BV4z1ybT for ; Sat, 10 Aug 2024 01:38:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5C472886B1; Fri, 9 Aug 2024 17:38:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.b="fM6Ede2h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E9D288B36; Fri, 9 Aug 2024 17:38:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 384B788670 for ; Fri, 9 Aug 2024 17:38:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rminnikanti@marvell.com Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 479CJQLH000601; Fri, 9 Aug 2024 08:38:25 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2043.outbound.protection.outlook.com [104.47.70.43]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 40wdpxhrx8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Aug 2024 08:38:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=n5UbRTOuGWy5lQ0U7nZucCeQig9pqmBw1Ct35h85Y1VUDfAnhPemESGRhth0c86HVoDeWY327NAy0sqsv1EQEUavI9f6qZdmJ9b0FeoLnmM+sGBLYBscKCOEvoTLPCIJjAg4uDZRCz67WgK3L9z1fvefo7/yjhRvo7xy/htgjwvHzZzvVmKOZoPYmQr8kpHHyJXA5t8MU00S0RyZWbV4FQSt0JrVlKv1xF3GS4+8wmkPU68+c/a9dWLtU9Q/Ql1fq7b8FjbHwF/+8+76+bvocQONE5RIPSqVHaxyatV9GEBaNzWniinaP/kWhjfIV8GEGCxsKktV44aOjae2fcgcSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=m+ML6wAQRnb1sCCwbrwB97J/Khg3+AQK1lLvKJAFJvM=; b=OS0dAgUqaV/6B9HfcxDNrWojyQhSLIx+F7Ux2nQgM6YtbNDMMpcHjkvN9O/K8XbFgu2FLfY67N5+kPKgzCCEm/PGJmnBvnkwUMkYaSiHX0FEK0QpBX9XQ+E81gkgSmnlWY7FynE8RTIsbGLBBFrGxa2sKmfaJWNuRk49je5eeCALrZkipeOcI/Ucw3QvspnjMdUHp624lu2IwG5+DQkmlDcVhpJ4VOKiBrrd6cK2gYFtqYalVCqIy9xB82wOz8G5bD0H/I2W/GAWVseMSRYasa+KrTwXjxaanOqojEB6DoH0KW58ngKIEmbxqDH5KxagUSeeW5Lt3rBXg0WO0FF3Ag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m+ML6wAQRnb1sCCwbrwB97J/Khg3+AQK1lLvKJAFJvM=; b=fM6Ede2hqzkTHT9/FrG+Rbq2DcJQ3CvlUMgUrhLEI4VmcHDG1rOwXsDutWo4CICBdrOCJW3behhhEIMGotjc6MTiASWuXezgA2tTIylsbi9rOVNLn2LqTh7ai76l/aaSsXpeOsgbwivt3q5OpWR/rHOSZSGIWxBVFsHzpG7T68o= Received: from CO6PR18MB4451.namprd18.prod.outlook.com (2603:10b6:303:138::12) by SA1PR18MB6035.namprd18.prod.outlook.com (2603:10b6:806:3eb::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Fri, 9 Aug 2024 15:38:21 +0000 Received: from CO6PR18MB4451.namprd18.prod.outlook.com ([fe80::4c2b:70d5:95ac:1d6c]) by CO6PR18MB4451.namprd18.prod.outlook.com ([fe80::4c2b:70d5:95ac:1d6c%6]) with mapi id 15.20.7849.015; Fri, 9 Aug 2024 15:38:21 +0000 Message-ID: <03cdd29b-331c-76b0-f6d7-a064552ffd67@marvell.com> Date: Fri, 9 Aug 2024 08:38:18 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Content-Language: en-US To: sjg@chromium.org, Tom Rini , quentin.schulz@bootlin.com, U-Boot-Denx From: Ravi Minnikanti Subject: [PATCH] env: remove vars that are not in default env X-ClientProxiedBy: SJ0PR13CA0105.namprd13.prod.outlook.com (2603:10b6:a03:2c5::20) To CO6PR18MB4451.namprd18.prod.outlook.com (2603:10b6:303:138::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR18MB4451:EE_|SA1PR18MB6035:EE_ X-MS-Office365-Filtering-Correlation-Id: 06453833-4776-4b3e-168d-08dcb8894c73 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?vPRynPNKsWEmydLCjaRJhSxCAyds0wf?= =?utf-8?q?h4yGQxaYdiBv77qqMuXJsj9ZstX4U2dMLRbPLjb8CHCDpWogEkhXZPfpReOCoVtFs?= =?utf-8?q?O/bWwvzq8J6aocBbcXKsBAQfG+Bge0NbouVMkt2dLZR8uhN5/E9DBOx6h5hsv4BM7?= =?utf-8?q?We52gn0+GbrE7X6ZXXGFpsGzMyaq85T2sznNPwvaRMcLgwXdGljzfznJwNIqy76OB?= =?utf-8?q?cLqKH5vTKIvFoxpDiEuA+94PD6LiaNyJVIb03fDDLkSrhcA6nc6h+pORYBoBHroOl?= =?utf-8?q?pLGqgs23EMxY0QOD7KnCgYL5LtyebiKjdTXuFrInOhOgC9gwhHFc8u85bAw25uqa+?= =?utf-8?q?pIjoF/YoTrbT69wcPB7yPZhS9Jia2XwgTDYmpoZKe7zk5TS7H/nvbgOzCxvbUy4OC?= =?utf-8?q?61/mDqTGCx5n2Yu5ojCT36NDDFD1NbuNCryebesoGQ5ZGUg8vfJlhNO2ZV9gqMVTS?= =?utf-8?q?G483c+eVGVl4iu7+zCBRod2damMBtFy+wa3W/E/xQsXIjKv7fOhV1+134UFF7Vd6X?= =?utf-8?q?RDVtGsFkonW5Rhp+E4epXO7t/nJnkTQuXVhUmG5aG6H9H7I6cIgcX9AwnN61k1Lh+?= =?utf-8?q?Koo4w0d8a/bUJbvUosNV8W8HnPjgaoWOPwggWHJDl1mmJoVakRzilys2pwWROXYfg?= =?utf-8?q?MznlOdBdZ7BWnPSPKiNpEONG5DvFiByy7x/7203kFzgejhqnV8l6lZ9W/JavWUXRw?= =?utf-8?q?abWGCNZixu5i9ZhqbKJZzFop5z/mgZWk+UYQM87Je9QugzRHZH+GBPdwtpwvfrSg1?= =?utf-8?q?ze+Q484BlPlcK7Ig5+VXYNkYfrZMBXOMBP3m7EKbkdEMQPWfj0UYXdBAUQV3PBnLV?= =?utf-8?q?88I+ntUIiewdTcxAqCH6fK4sU9Eml2jEbhYh/O4y9fQUOPNzs/cxok3hycgtc8vF/?= =?utf-8?q?ps7w4XL0uWzesNZ2LioyHX8hgFDiAnoGF+odMcnKU5Lz1e4cjUsy4M/quAIRK6T2h?= =?utf-8?q?XYlAvIHXL1LVBjNNQfAQV7U1VdzNjOYxrNmCPUxqGiyRaNllNWe9vdepH2hcBSTYs?= =?utf-8?q?+ARs8Jkpc61KHvJ5ybMtnbDRb3LJ0jOh+Ay8J9MNt91DSWgBtcuLufHrw35Ck0oXv?= =?utf-8?q?eAO/v3bizUumm1MMsLXEHZbd1IwrcNts+PDIh5Nqzy0ByStSYG/5mEZSifoIcDGCg?= =?utf-8?q?rcm8Y9mr9+i9JaJS7/jgImZ/jm3tVTgYtIC5NhfV6ZV02XbGtOGaLbKaHgoNHbolU?= =?utf-8?q?nkrWEFgeuJS2v5KB9T/UN+PPo8AIjIAf4oQ6wvUtRoZy3jRhXiqfoLdA1hi4SpAEc?= =?utf-8?q?HxcH6qkqxVqutcqUVn5E0wF0hi2NDbJ7W3w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR18MB4451.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?08joDX70GwE7a6ObljNq2r8jnRL+?= =?utf-8?q?vfMyBpneHWMBHwSNnbFKBC/lCk/CJpYAGrjQ+ao10ZoS5XJzFWnoAswxky37GhC/4?= =?utf-8?q?/JH3+yJuV7HhdK5/hb5eINsFYczaSZMWRfYTZlT6SyRDJQPJhwdPjx3LiyV7lw2Yo?= =?utf-8?q?3wT9uAAy7fYHq3Me41IPLRR7Y+XJr9suWmnyqnYY75V05qTF7v81qHVFhvu/3iLgY?= =?utf-8?q?MyxMmb38RUFi+d5WXtZ0pVZ+AwNCwebJNmgcFplskAvVoecEqlVO5CcTEzJBiDKnC?= =?utf-8?q?gNuhfzddLsX/fYXrYXgfR+427+EobaXqf8Jlx/j+ddQ4+iB8tOm1eLoaijXen3yZ4?= =?utf-8?q?1mXXp/LsNMNKVaP0ZUH0tRD8OsJji4Yjh0ZQsmDjZaGSHnBDX67ZEeoT3JCF6Mss8?= =?utf-8?q?MuYEx/hcb7Vn1LYf2mL9MaCvglFJ2Os2sYIPFlROVPukFlwY2jmENF4GQF4YbVRqL?= =?utf-8?q?tQJj2MXjKhPWNA+iDFNxJW6Bfrt48raGc4+61LToAnKs8HVauppLZmQp9wbBQT9Fp?= =?utf-8?q?PdXBSVx0yMVBNgFCkG/+alHRnTDZX0pCx5KrWZErUQkKuHxYC0ub5T1E9iHvU4Njt?= =?utf-8?q?/l2IRwGzUhR4luqQfeTQKbruSnMOTEhU2dbYXpl2PSNc0HuAEfy6iMjTdDCMyqsik?= =?utf-8?q?wdUThimYkBFGeumAasr0sWxyZzn2is28WuopnhoU1L/ZX3Z5an65ehYCSluf/KmGs?= =?utf-8?q?Dxa/y2KJg2kRJjDDv2Wuq7GedBZSyNZ+NrWdlem8do/3DG2pxZef3Zaq0fOX/TX6J?= =?utf-8?q?ww8DNoOwm6GewiYHWTsqYTSzBk2yeBptZWLyvwNVXjG30Z5RCLxfqqqrW5UeQdjFo?= =?utf-8?q?gh4CU8pGv2tZjBVpS3mR6/XEPga4A/7pTOzPv9J4ncY7GPIWCQzfy/PvXIYPjSgs9?= =?utf-8?q?qEBv7iXTNfWNTTXqK+kITxn2DKI7vMxquD2MzlA5XwEs+6nxadjkG5dOSxhodnhBI?= =?utf-8?q?BqM8dLXew4zM37TClhzxkcn8nwNBLtFTDvVVkE7MDqpzzki+wAIz+AHCp+IdRqZPo?= =?utf-8?q?K6Ek6G6QHpx1hcRDxrHCJ7KD2bt+D0ve24Q5MPn6yBl6+XEcZy0nhVmNw2Yy6dTqB?= =?utf-8?q?hdEDAvdqAugKEOnU5KsRO1R/X+UFW1yxJftwZT2JQpd8WotWlknUXgiFSpxgNLe/c?= =?utf-8?q?oakCs8sXVk9H/BbidotmqAjdExGf1GHSio3EqCYsOSQCq0Dw0ImH2O7EoeuEUU597?= =?utf-8?q?kizrBG4KAfBKvgWyvJ9zpkOMothW6Mf50jd+pDuIbhvTlVVIuGg++eDXi/0N8dhnQ?= =?utf-8?q?aa4AiiAzoJWeo5GqaO7nJpeaenPB7dCoJ9JtZE0o9LBXlVLus+YMk7C5six8z2HRi?= =?utf-8?q?cQgSIwk79ZJq5FEQZTdKudDqWHbB0IdrYxjmV7Xm+WNqXDe9KUlNWqhoPSqiTWyXS?= =?utf-8?q?l8eyUYp3ZDo3mPucAt/0hIC4BLRrTBVjm/0rNWZ3LA9yfmBFJ4X1IdK3zLjeKT5h6?= =?utf-8?q?9nHDXl2pzAvbaSbAXNuSWPC10t+FtUZxmZsg7jq3h1Admh8tOuSHLifYGzm8cSdTa?= =?utf-8?q?hbyxDEirkht6ON+k+pDjy0p3G+23xdbFIQ=3D=3D?= X-OriginatorOrg: marvell.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06453833-4776-4b3e-168d-08dcb8894c73 X-MS-Exchange-CrossTenant-AuthSource: CO6PR18MB4451.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2024 15:38:21.3956 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8o0Iv4qJYe0JHq3BKBw/VI7Lei33htVkTFCugPPIKnI4JX0dL1qA6PCD46FxuPVc2AYo8c/wBwcSVx58g6O2Nw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR18MB6035 X-Proofpoint-ORIG-GUID: yK-861I8bl5tpzeklul8JsQkxjdhgOQC X-Proofpoint-GUID: yK-861I8bl5tpzeklul8JsQkxjdhgOQC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-08-09_12,2024-08-07_01,2024-05-17_01 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 current env_set_default_vars() doesn't delete var that are not in the imported env. hashtable removes vars that are not in the imported env but present in the current env only if H_NOCLEAR flag is not set. This change is to avoid passing H_NOCLEAR flag if specific vars are passed to env_set_default_vars() Test: Without this change: Marvell>> env default boot_mode Marvell>> With the change: Marvell>> env default boot_mode WARNING: 'boot_mode' not in imported env, deleting it! Signed-off-by: rminnikanti --- env/common.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/env/common.c b/env/common.c index 8d47d72605..2f783e3a69 100644 --- a/env/common.c +++ b/env/common.c @@ -401,7 +401,15 @@ int env_set_default_vars(int nvars, char * const vars[], int flags) * Special use-case: import from default environment * (and use \0 as a separator) */ - flags |= H_NOCLEAR | H_DEFAULT; + + /* + * When vars are passed remove variables that are not in + * the default environment. + */ + if (!nvars) + flags |= H_NOCLEAR; + + flags |= H_DEFAULT; return himport_r(&env_htab, default_environment, sizeof(default_environment), '\0', flags, 0, nvars, vars);