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 2F750C4332F for ; Sun, 20 Nov 2022 14:25:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 48579854B1; Sun, 20 Nov 2022 15:18:19 +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="uH99eS+s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52DC08533B; Sun, 20 Nov 2022 15:18:02 +0100 (CET) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (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 632C0854B3 for ; Sun, 20 Nov 2022 15:17:56 +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-qk1-x730.google.com with SMTP id s20so6549435qkg.5 for ; Sun, 20 Nov 2022 06:17:56 -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=RfiR6rEvn/ZZqRGlioI5zBS8Bt9/RLDBXzQ+LqLQZcs=; b=uH99eS+sdtUVrcT4Itlshs8QWSDA3gyxbZvSbXt+/nttBvLsL54jgzEfgDc+7uktyr TQUbF2odXzuy0uInZ868JlQu4YhY/agxJV0yX2HjDe3h8Zhpg/Z+qcQhmzeUFxgTCv+q JUbptstNGOfBZxS4G8w4SnaPvLJUJyXiYAi7o= 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=RfiR6rEvn/ZZqRGlioI5zBS8Bt9/RLDBXzQ+LqLQZcs=; b=ADMucRK4pDJgsZoFEntVAaC/tatNCes+PvpSYLMZO8/VlRHDr+rknR/Z3AqhBAyVId 65FKdH+4An995OyNeBRT6vBTafCYMBjZAVAPOBdNHwRHos0en4i0uz7NduKMYYwUpJTU ZHxDjloMRSwK8oMuynoY4/j+E3aDokk5vegIuaWFpoNmHaoRiY8NBML+bwjKlIexjGQU N+WPsGHh9k+IfRiY5SNOHbJgaFbUrfW8XQ+YAwyLPDmxvGNpQiu9y7EyXTegSqTTYm0I eucEeChV+zck4PGwfyiN8LloEq50I8y2e0JB3Yjywc0tXun03+tjqp/PUFNsNpHHBuBt sFkw== X-Gm-Message-State: ANoB5pk5QVjz6NYcFDO6uUOsnAZ7v+ZPBAn5qEORXxPfb2SL9g5B7L+s NsgcitUK1NP7gRgYeDpV6y1zFKf4xZ8wBg== X-Google-Smtp-Source: AA0mqf4aBhWqpyAPKlpJFP0vQD4D4dDiB3X5qWxhmTU/Z2/ZWRmKjR/dralXNn7tfcGLuZnz5LKvoA== X-Received: by 2002:a37:5846:0:b0:6fa:566f:eb1e with SMTP id m67-20020a375846000000b006fa566feb1emr13036776qkb.616.1668953875126; Sun, 20 Nov 2022 06:17:55 -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 bk23-20020a05620a1a1700b006ce580c2663sm6400114qkb.35.2022.11.20.06.17.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:54 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 216/241] global: Migrate CONFIG_TSECV2 to CFG Date: Sun, 20 Nov 2022 09:17:18 -0500 Message-Id: <20221120141743.3059310-17-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120141743.3059310-1-trini@konsulko.com> References: <20221120140829.3057894-90-trini@konsulko.com> <20221120141743.3059310-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 --- arch/powerpc/include/asm/config_mpc85xx.h | 18 +++++++++--------- arch/powerpc/include/asm/immap_85xx.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 0a67c76b61d6..b81ce1f98ba2 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -24,18 +24,18 @@ #elif defined(CONFIG_ARCH_P1010) #define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 /* P1011 is single core version of P1020 */ #elif defined(CONFIG_ARCH_P1011) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #elif defined(CONFIG_ARCH_P1020) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #elif defined(CONFIG_ARCH_P1021) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 @@ -49,11 +49,11 @@ /* P1024 is lower end variant of P1020 */ #elif defined(CONFIG_ARCH_P1024) -#define CONFIG_TSECV2 +#define CFG_TSECV2 /* P1025 is lower end variant of P1021 */ #elif defined(CONFIG_ARCH_P1025) -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 @@ -108,12 +108,12 @@ #elif defined(CONFIG_ARCH_BSC9131) #define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3 #elif defined(CONFIG_ARCH_BSC9132) #define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2 +#define CFG_TSECV2 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 3 #elif defined(CONFIG_ARCH_T4240) @@ -221,7 +221,7 @@ #elif defined(CONFIG_ARCH_C29X) #define CFG_FSL_SDHC_V2_3 -#define CONFIG_TSECV2_1 +#define CFG_TSECV2_1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CFG_SYS_FSL_SEC_IDX_OFFSET 0x20000 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 05b83952f231..7fdbf8504f32 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2541,9 +2541,9 @@ struct ccsr_pman { #define CFG_SYS_MPC85xx_USB2_OFFSET 0x23000 #define CFG_SYS_MPC85xx_USB1_PHY_OFFSET 0xE5000 #define CFG_SYS_MPC85xx_USB2_PHY_OFFSET 0xE5100 -#ifdef CONFIG_TSECV2 +#ifdef CFG_TSECV2 #define CFG_SYS_TSEC1_OFFSET 0xB0000 -#elif defined(CONFIG_TSECV2_1) +#elif defined(CFG_TSECV2_1) #define CFG_SYS_TSEC1_OFFSET 0x10000 #else #define CFG_SYS_TSEC1_OFFSET 0x24000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fa67d6fe3468..1d60965b520c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -229,8 +229,8 @@ CFG_TSEC3 CFG_TSEC3_NAME CFG_TSEC4 CFG_TSEC4_NAME -CONFIG_TSECV2 -CONFIG_TSECV2_1 +CFG_TSECV2 +CFG_TSECV2_1 CONFIG_TSEC_TBICR_SETTINGS CONFIG_UBIFS_VOLUME CONFIG_UBI_PART -- 2.25.1