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 60BACC433FE for ; Sun, 20 Nov 2022 14:28:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 928408550E; Sun, 20 Nov 2022 15:18:50 +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="fz4xExgZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 15489854E1; Sun, 20 Nov 2022 15:18:19 +0100 (CET) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (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 D1AD8854A9 for ; Sun, 20 Nov 2022 15:18:00 +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-qv1-xf34.google.com with SMTP id h7so5913931qvs.3 for ; Sun, 20 Nov 2022 06:18:00 -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=RK03wPmsOgsALHXzPs88V+a0JCtNn4pvhVsEYOxUnJI=; b=fz4xExgZuXeLtare9sDqA7V1xDwYQx2xAv+Rd9i6sV2NtH3/iaE8bdzsGdmFyUKBkS FF6Cya+g35d78rITBzBaPH9ImnxFF1qlLzIe4GW8yiS5VyNnwMN2Dk59vuUHfPxb09on lZWpiQkDNaENobNspH9mImev3K28zZOLL0UeU= 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=RK03wPmsOgsALHXzPs88V+a0JCtNn4pvhVsEYOxUnJI=; b=jCgMSCYB14oKBopAGNAq85f3p/TJ1ZwY/D1C5MVl4lZdN60E/Oa9MedhsGOPlXEGgY 0IdX7qSAx60S1CDuXZUJSB+vL4YhPBGdv0NHzQVFa2DVHXN0g0pHV1AsfzxfpdL5NLX+ 6fKU62RPvm4U5A+ctcDXc4gs0+mCDBZkQNI5eP1IlZDj/KPFkVJKoCYC/5jisqS8b6RV gOn8+o1/M1vYvG1TvPZLfbjg5jBvyJL+oMSh3/ASWvL1sp7Pt2bsQotKRWduKRnf0okl h9mAIo1d7lTf/rlzmLKTMGqPrgVW+gwXCuzFj5X/m1GRyLz6XscRbv6eupHyeBjGJEQp uH4w== X-Gm-Message-State: ANoB5pmowaXhk4RfSLngoCmn07G6qcNYuPDynbaQZXlKEwDjCKhP4kMU WNzP+8HEreDWk1EtpjK/qAH7/B3158hFlw== X-Google-Smtp-Source: AA0mqf5RNfdjihE572NGOZ9X2NPQ/e5wHeCzskW9N1nuhE6zgf4+UpgiFz7gegGXrhyZgTTfrgr3pw== X-Received: by 2002:a0c:d611:0:b0:4c6:84cb:4e33 with SMTP id c17-20020a0cd611000000b004c684cb4e33mr13871519qvj.72.1668953879494; Sun, 20 Nov 2022 06:17:59 -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.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:17:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 223/241] global: Migrate CONFIG_UEC_ETH to CFG Date: Sun, 20 Nov 2022 09:17:25 -0500 Message-Id: <20221120141743.3059310-24-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/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc8xxx/cpu.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/qe/uec.c | 16 ++++++++-------- include/configs/km/km-mpc83xx.h | 2 +- scripts/config_whitelist.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 8d531898bd89..52d804cce19d 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -187,7 +187,7 @@ void watchdog_reset (void) */ int cpu_eth_init(struct bd_info *bis) { -#if defined(CONFIG_UEC_ETH) +#if defined(CFG_UEC_ETH) uec_standard_init(bis); #endif diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 7f2019092296..3ee6908f436b 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -351,7 +351,7 @@ int fixup_cpu(void) */ int cpu_eth_init(struct bd_info *bis) { -#if defined(CONFIG_UEC_ETH) +#if defined(CFG_UEC_ETH) uec_standard_init(bis); #endif diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index b9f519aba6e9..f9eea1ad9c58 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -402,7 +402,7 @@ int board_eth_init(struct bd_info *bis) tsec_eth_init(bis, tsec_info, num); -#if defined(CONFIG_UEC_ETH) +#if defined(CFG_UEC_ETH) /* QE0 and QE3 need to be exposed for UCC1 and UCC5 Eth mode */ setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE0); setbits_be32(&gur->pmuxcr, MPC85xx_PMUXCR_QE3); diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index 310887964352..feac4f701e60 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -27,28 +27,28 @@ #endif static struct uec_inf uec_info[] = { -#ifdef CONFIG_UEC_ETH1 +#ifdef CFG_UEC_ETH1 STD_UEC_INFO(1), /* UEC1 */ #endif -#ifdef CONFIG_UEC_ETH2 +#ifdef CFG_UEC_ETH2 STD_UEC_INFO(2), /* UEC2 */ #endif -#ifdef CONFIG_UEC_ETH3 +#ifdef CFG_UEC_ETH3 STD_UEC_INFO(3), /* UEC3 */ #endif -#ifdef CONFIG_UEC_ETH4 +#ifdef CFG_UEC_ETH4 STD_UEC_INFO(4), /* UEC4 */ #endif -#ifdef CONFIG_UEC_ETH5 +#ifdef CFG_UEC_ETH5 STD_UEC_INFO(5), /* UEC5 */ #endif -#ifdef CONFIG_UEC_ETH6 +#ifdef CFG_UEC_ETH6 STD_UEC_INFO(6), /* UEC6 */ #endif -#ifdef CONFIG_UEC_ETH7 +#ifdef CFG_UEC_ETH7 STD_UEC_INFO(7), /* UEC7 */ #endif -#ifdef CONFIG_UEC_ETH8 +#ifdef CFG_UEC_ETH8 STD_UEC_INFO(8), /* UEC8 */ #endif }; diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 3192ca7742a7..8e4d40dd7683 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -94,4 +94,4 @@ /* * QE UEC ethernet configuration */ -#define CONFIG_UEC_ETH +#define CFG_UEC_ETH diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ba5d1be700a3..83c7abfab261 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -237,7 +237,7 @@ CFG_UBI_PART CFG_UBOOTPATH CFG_UBOOT_SECTOR_COUNT CFG_UBOOT_SECTOR_START -CONFIG_UEC_ETH +CFG_UEC_ETH CONFIG_USART_BASE CONFIG_USART_ID CONFIG_USBD_HS -- 2.25.1