From patchwork Fri Apr 28 13:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1775000 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=Wdx39dzk; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q7DR50Kbxz23tZ for ; Fri, 28 Apr 2023 23:46:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8D46E85F89; Fri, 28 Apr 2023 15:46:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="Wdx39dzk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC790863DC; Fri, 28 Apr 2023 15:46:08 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::611]) (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 E692585F89 for ; Fri, 28 Apr 2023 15:46:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPOZzNdVOcNrvlS7XF33HKuflUrhLSkDBzbJdyjFaP6XrVIMSgm73bhf6L/GX1LQKxqGwgBcG2Z9ZGOAiZu/4W/iQouMtE8E3eb39bkjlNYSeYtWueU/c7YvGqbxqAPwAxUYTCnB8VYV2i6PYiv8Nx7YA2J6iCoYCIpXnnhrmEgU5f1GxCYVUdFpeXHt+sq9xjWIyuCmdvVcob8K/1kKlZXXOnz7Bh4hag+OjZRGXGUxQ3iEHs+lZvSqLlgiuPAfMWdP6PcVNweYxYc7oAFWIVyzpkWuQfBz10UfbmIOxAPx5OStiMZeo8e7MaX4o9c1Qq0Ds874m22lsBo6Reps0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=lHakq6BttjcZjQXsL93C6Z/jEYpckV12GJmX34M31Fo=; b=mmMw3kHuYXpns09v9OBFDP6W4dqKUrUfbe7z/I2BnwkXR64l44fSsTTXUNGo9UHPlhK+TXUOyG8m+2mjvYljsiVoBoj2eZlKv4x/b0h1yDZsrJAobIYVmezx+6chKUxE4ItP6aaxInKmP/VE35qKod15J1a1w9Dyd1Hcd/0YXsEprfyBcusw6BR43/6jGTUPBIuwxPrKIGIX5FlkoNaBE9Yd+H7eg/XbCFSeCA15TMZwb4L2ryqJfZk87Lrf++D7lTyGGT8F16uDvCWqlgnzwsfwZ4FigP3ZDge+K23RYMk0IbVF4/bBozP2CU1xrKCxOXoBHKCggQSriXr6gNZo+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lHakq6BttjcZjQXsL93C6Z/jEYpckV12GJmX34M31Fo=; b=Wdx39dzkDEeWqQYNcTAP7k57hmtFR2Md4EuJqXsyyHNy34bxG1WJuwZPdHgYkwJNnlwwdfEBKGgKJ1UbIskS94Sky6zgV5UZDSZDY0FjRfvTFphQV3UVGUFm9Dqr05pEHxWYOYxK9lYyniUH9FwIvwElT053Xy7U+SnKw3NOZvc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by AS8PR08MB8826.eurprd08.prod.outlook.com (2603:10a6:20b:5bb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.22; Fri, 28 Apr 2023 13:46:04 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::5979:132b:6e3:cfb2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::5979:132b:6e3:cfb2%7]) with mapi id 15.20.6340.021; Fri, 28 Apr 2023 13:46:04 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Heiko Schocher , Joe Hershberger , Wolfgang Denk Subject: [PATCH] env: Remove misuse of env is nowhere driver Date: Fri, 28 Apr 2023 15:45:35 +0200 Message-Id: <20230428134535.26275-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR3P281CA0107.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::17) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|AS8PR08MB8826:EE_ X-MS-Office365-Filtering-Correlation-Id: afc9ffd4-f8ec-4f18-f2bc-08db47eee8d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vZ/zJVfbM3Q3kHW/lRujy8nvz+f35f0s3fdecirAiCo65witbwepQHU6HbEf/ySYQGPr+LvtH9yzAe4+bn4UIQGwYaUKCxJgKnJrsjQfuTV4sfpcfnaLTXPuJR4EI87mGehlQUkoYWgXwvrjuGvzJkLaeMt+oQnSg7KAqSNbgfngqZnCP7S4JlkVMUKL7IIPif1Xoon79i8SjXJNXlLrZ26oKGRyUTUJI6o2nUmpJqezmJygt1/xkr5TWm9klBBEJFHB/hANfmovIv07lAz3GdWZsqyf/Dh/Mocxis2EFq2eul1PBKy9qRWHy5Y/lFi+R49gQNMA4StWjroF0AM53VbuRM8DOW4rpXT+17lSmyQaWt9uijF5wcV8TezH8NnKjctpVCzL1UdfRRQSNk4/Al1yAouUuw1THV56cW/4V3BR+05DcgPwpApQ0oFudr8Ju495vm6EXbwiuLHViX9S9TJEhVpTvHEpPjRI4iAjob4nbKNdanStL107BOUGbAaIStlFTK/G8VkKjbuZLD1FIjpFk6Ug73Xu/eHZHknKHLN6Rj2gbgSgE26Yj2KeNVdUXl0ZNA2PFvRXpFEnX8ekxblhNOua/3gkR2OrYbfrYDq1k7TfwjQIw/C8YfY6xDkz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(39860400002)(376002)(136003)(366004)(451199021)(86362001)(2906002)(36756003)(6486002)(52116002)(6666004)(2616005)(186003)(83380400001)(6506007)(6512007)(1076003)(4326008)(6916009)(478600001)(66476007)(26005)(316002)(66946007)(41300700001)(5660300002)(38100700002)(38350700002)(8676002)(54906003)(8936002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WoVGhhCVDx01c+G/Y5uFcgnr2MAoroM5qqyAzgJMNkxod5VM7C6eyFzbRs3NpFLWQpalU9ufX0mFPIpU3+SCd1CVAp0TjiGYiN9GIB2W+RADGvRnxU1nM/3TC3+3ed6Xcq4ocp6+XIriHWZ99Fx7UxcJTC/Pw+VFw0uvp31oe5nAK/gFFkCmFWz9f4w2dnOOvSEHfyGFdlOqpkd2THfKmY4wm9PvzMJxxBOIR+YarjrEh3Q4Af8/LnYCgWURTfaMxPYvUj8Y8vG3vnYYj2W57sLkPsx5K1DfrDucrHCPqKSsMn7b6AzDOB2fWnwzCGe+uxVgH+1qhqhJtuZkrYP+EtDvUZJT5wtY8gFdCn9qwsQu7g+wmNZzWQJS1YZ9w2orNtif8sS0RZPPMDMoGqkQa1CU6xsVzlgkR4t0HfmJ2xyCIEr6fZaygH0DmSIUxY9BGr8AGimjhCK6CKysk3AeIGxb5vDa9gXaN7xzKxqffpBMR6Wxw4GZNksqWdRKfn0ajjbF/yPCjxtNCX/3nFZGOnnqJkZ940GPXaTfZ1uhiXkGHLW7IQoV+MOoiIC6h1g2By9Gv0IfPtBMnL4f7E9vt+iH8twyDTMnlRnvqwkUqL3XqA/f/iLXgGBgUg73daMBFv95MSoFysJER5Gb/LzT+Kp06Bnq476ua4EZ4t/v9AZHpQ4cHyWBnvz3x9xn6qleyBZ+8p7wB/1UqC3WeLgldOJQuyUdiLcxjunYPxzaeQbDidNFdyzSmclNYmF2wQZWIS9mh4V7DlGBmkqBB/4gEu5FpLHPUnO+dPpAtNIWBKSqM3tYjJOp4ihLA1PUvFEMiutJlV6h7vFz0J5bIeRgoxtp4FLiJscW268UNMTCOHY04R9VB580tBymmLA4rQjNx3Tk90bTU+7h8NYKqHQyXz2XQ1tt6Jes5SVkxauQ4qK57SxUvTZqbgrEFpnkT+zojpc7igDKi18AIChuPqyFJichi+x5aY14O1gZGe6TtdnllaTSDnPfF/lZ7H0WwumcJIHwKu/YqeKNd2KXP0QgGA4dexbReZT24FNccZYLH/yItXA0M/S1+9B0WT2iDDAp70wm7Px0m86z4055x1E2//VYxU0iIpahb1MiTlFM+XJt5JT2SqfDZMdJFVy57t4t8BSCo2MKgufFJSzZCaYSi7hfAyMuE0rJvPld/fCGxd8/hjo4mM28A/i9AvnCiBO3DBD5VhgihbuPg5lowiclq4YfAoBfBOvBJYvE60fGUcF8jPwtTERh04Y5PXaTp8NHVl9454yR8YF1e6/YjCMf5OUNw2QtaTrs03k+PDNpeSm7DZ1aWBx75Q7jqlcHq4uYKRa16o3v+3/CdpfWleNg9X467JABon4nwGobQ7VFpS+WSgQU4vD7jAxJfa3Trw31o2Z2XEiwrM0dFjabvtSWl8b7MM+aQEC6d0bMKravct5r0s0yv0ananVSJ3+GnHHyb6wWYn4/geqrjLgLMBySjnveZfu3xyj/g5yABsf8GzLeygeal7DB2tmFq5APoNSHHyvuZq7lLFVIQlZEQ90dCDuvOa0JZP6+Z6rSSA3kKBHb9v3eVB03UN+sC+CChqoJj6EjrU3IhwTacAQNM6UK7g== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: afc9ffd4-f8ec-4f18-f2bc-08db47eee8d8 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2023 13:46:03.8753 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1VtGiBVOduuX9TGm0b9GclUouUQx+JTYJlY+1BsjCf4K6fUR3Av36PRDNldAIl5FZAwI2CJpKp8wLWMKgaFW5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB8826 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 From: Stefan Herbrechtsmeier When using a list of writeable variables, the initial values come from the built-in default environment since commit 5ab81058364b ("env: Complete generic support for writable list"). Remove unnecessary misuse of the env is nowhere driver as default environment. Signed-off-by: Stefan Herbrechtsmeier Tested-by: Heiko Schocher --- board/aristainetos/aristainetos.c | 19 ------------------- configs/aristainetos2c_defconfig | 1 - configs/aristainetos2ccslb_defconfig | 1 - env/env.c | 2 -- 4 files changed, 23 deletions(-) diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 770f3d7d0d..35beda5cf5 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -529,22 +529,3 @@ int embedded_dtb_select(void) return 0; } #endif - -enum env_location env_get_location(enum env_operation op, int prio) -{ - if (op == ENVOP_SAVE || op == ENVOP_ERASE) - return ENVL_SPI_FLASH; - - switch (prio) { - case 0: - return ENVL_NOWHERE; - - case 1: - return ENVL_SPI_FLASH; - - default: - return ENVL_UNKNOWN; - } - - return ENVL_UNKNOWN; -} diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig index bd7947b46b..ec93284c20 100644 --- a/configs/aristainetos2c_defconfig +++ b/configs/aristainetos2c_defconfig @@ -58,7 +58,6 @@ CONFIG_OF_CONTROL=y CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SPI_EARLY=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig index 3fb6e71c67..01d9169950 100644 --- a/configs/aristainetos2ccslb_defconfig +++ b/configs/aristainetos2ccslb_defconfig @@ -58,7 +58,6 @@ CONFIG_OF_CONTROL=y CONFIG_DTB_RESELECT=y CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SPI_EARLY=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/env/env.c b/env/env.c index ad774f4117..2aa52c98f8 100644 --- a/env/env.c +++ b/env/env.c @@ -217,9 +217,7 @@ int env_load(void) printf("OK\n"); gd->env_load_prio = prio; -#if !CONFIG_IS_ENABLED(ENV_APPEND) return 0; -#endif } else if (ret == -ENOMSG) { /* Handle "bad CRC" case */ if (best_prio == -1)