From patchwork Sun Dec 4 15:04:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1711919 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; 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=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=KMMbtVav; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQ9HK1813z23mf for ; Mon, 5 Dec 2022 02:15:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4EEFF8550E; Sun, 4 Dec 2022 16:08:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.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=konsulko.com header.i=@konsulko.com header.b="KMMbtVav"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 90CEC853F7; Sun, 4 Dec 2022 16:06:57 +0100 (CET) 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,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4F23A8545D for ; Sun, 4 Dec 2022 16:06:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ed1-x530.google.com with SMTP id c17so4032636edj.13 for ; Sun, 04 Dec 2022 07:06:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JpZ5xCvab28KtJ3lQmshYsESNKWJcv2rftbHAbEAAus=; b=KMMbtVavyA7T2UwgtMI+cRabl4USSZWEFRsIgO2/aEsDXhPR06Ukv1CudQBk3nD7HQ jrd20e4neKBwONs9ddLMb3EFwlmN+E5Qsb9NvxMiu0zCD4EDbJwcQja5rNLPUgGM8C/k Jzf9BC0pxwkv3aTihLWF3Njw4mcNrruxA/grs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JpZ5xCvab28KtJ3lQmshYsESNKWJcv2rftbHAbEAAus=; b=LU7MpYZJFpOYWeK45J5tvt4gR6QgjnQlfuXec88+XIKleRbVJOqhDvt94/w+XiqozG E/+y4PADBwD8mWqD6b/8PJNhUrN/phZelEBRExGtNQTFQP5vPgidE/NMSfJD6itsm3Zx muX6P792vhJo2+wQ3zSq011V+mHFIpBBqd+ki0oZssLJrxqmKpvP/Jc8LFboPLHot1Cv XrBOFgCSt7F8P6M7Iybt+Z+ggcmiZjozKVj7Wzmbb97Joxu2GlA4mQRutpBJqup5/SML z2MBV01RUuOQT0xfH/C2n3mkzYnXcLPKp0K/Kj/JuPkBGMErdF1L5wgmGhc9c1X46yJR U/WQ== X-Gm-Message-State: ANoB5pmcJFvHNuLFEC6ZBJGQaruP7fOSWJ2+hjpGFL3tJpPMbyaJ7frg At6y+7cvhNJn1GpaDvF4Cr6SUfUkJnuoAWaz X-Google-Smtp-Source: AA0mqf5rknBD38rHWozqLzYZLV3+iO6zPkafCNmTxjrnWy+Q7vCuWxhzbW8FLBezEzhiDC5R76/1Zw== X-Received: by 2002:a05:6402:1002:b0:467:7c62:64 with SMTP id c2-20020a056402100200b004677c620064mr68504804edu.82.1670166413653; Sun, 04 Dec 2022 07:06:53 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.06.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:53 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 050/149] global: Migrate CONFIG_KM_DEF_ARCH to CFG Date: Sun, 4 Dec 2022 10:04:15 -0500 Message-Id: <20221204150554.4165941-50-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-1-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean Perform a simple rename of CONFIG_KM_DEF_ARCH to CFG_KM_DEF_ARCH Signed-off-by: Tom Rini --- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/kmcent2.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 9edc5fb2e413..8f2a5a200562 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -78,13 +78,13 @@ #define CONFIG_KM_DEF_ENV "km-common=empty\0" #endif -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ "newenv=" \ "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ "era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 18304575f403..c10a3366b0c9 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -435,13 +435,13 @@ int get_scl(void); " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" +#ifndef CFG_KM_DEF_ARCH +#define CFG_KM_DEF_ARCH "arch=ppc_82xx\0" #endif #define CFG_EXTRA_ENV_SETTINGS \ CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ + CFG_KM_DEF_ARCH \ CONFIG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \