From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2019AC433FE for ; Sun, 20 Nov 2022 13:45:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BBB6B85354; Sun, 20 Nov 2022 14:35:38 +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="eP8WhgGZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2B0E1852D8; Sun, 20 Nov 2022 14:34:53 +0100 (CET) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 B8B3885286 for ; Sun, 20 Nov 2022 14:34:42 +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-qt1-x829.google.com with SMTP id h24so5890594qta.9 for ; Sun, 20 Nov 2022 05:34:42 -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=pRKuKsciadfKwMUQaqjD2n7AWsDOpS1xpJkZrxNpoRk=; b=eP8WhgGZcY59f9PV6udmk7Mz2Cn3tGCiOizqUkd1wwCX5/LWD4tvOaI+OhbQjr3LxA hbqAvFeBG3CBdZjuQjPKLcOPAUuhmrduE7KZxtq3gXX5LVkZ/E0NmJdxew5FPrOtZCyZ ez+ycpeWXwq4iMrWHOIVjiHK+Hgz734T8LJyE= 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=pRKuKsciadfKwMUQaqjD2n7AWsDOpS1xpJkZrxNpoRk=; b=J0EEbmrx9mA1Y+JAB1/nzmH0E2c3S4e56D4Ne/aVLOHsC/Hnx5hFAvQL+HB9/KXjVr tq/r0z/f2DPa8jY/xYD+MDq1dIO7R/iLx4K0u6pvkDV6V9p11nvOBra4rhR1mBHP2hIH CgLbuAYpyyNMUzTkiu+hOiSdYo47t/w9vyriQVYtfWLqgQrqVa9qNkd8PiB0wKFhTJie shAtWMdqPtGNsUogltZPvULPMbtLslYo6+HYLtNy43XA2GRQkT7zK4oXGM0zENQl+SEz OOfUIbR+n940M5L0y5UuRcvQ187BYFBRveX5hphxavaXqjpiyhJmG1RhWenbhHeyqNtA kzzA== X-Gm-Message-State: ANoB5plb/ZzKUkoFjdSNrgTe1O/7snr/g+L2IX+IW7T0qwG/XYN5Nogg +y+GGrLY7A9U1hugerYFbnMlKmSaTzPqgQ== X-Google-Smtp-Source: AA0mqf6NvBHxr2GNLHyBr49UMBBsJxMaEg/uTgwFJG+9jLUUvkX/1EiD48SOvB8r2a+Ri3TxIvqZCQ== X-Received: by 2002:a05:622a:1e1b:b0:3a4:30bc:849a with SMTP id br27-20020a05622a1e1b00b003a430bc849amr13547778qtb.524.1668951282211; Sun, 20 Nov 2022 05:34:42 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:41 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 068/241] global: Migrate CONFIG_KM_DEF_ARCH to CFG Date: Sun, 20 Nov 2022 08:30:59 -0500 Message-Id: <20221120133352.3055600-69-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Tom Rini --- include/configs/km/km-mpc83xx.h | 6 +++--- include/configs/kmcent2.h | 6 +++--- scripts/config_whitelist.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 227c45f0634a..33655d144df1 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 d7d5bce15c59..870603d461af 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -437,13 +437,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" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d2683e317bd6..12edc317773f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -70,7 +70,7 @@ CFG_IRAM_BASE CFG_IRAM_END CFG_IRAM_SIZE CFG_IRAM_TOP -CONFIG_KM_DEF_ARCH +CFG_KM_DEF_ARCH CONFIG_KM_DEF_BOOT_ARGS_CPU CONFIG_KM_DEF_ENV CONFIG_KM_DEF_ENV_BOOTARGS -- 2.25.1