[PoC 037/241] global: Migrate CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to CFG

Tom Rini
2022-11-20T13:45:35Z

arch/powerpc/include/asm/config_mpc85xx.h | 2 +-
arch/powerpc/include/asm/immap_85xx.h | 2 +-
doc/README.fsl-dpaa | 4 ++--
drivers/net/fm/eth.c | 2 +-
drivers/net/fm/init.c | 2 +-
include/fm_eth.h | 2 +-
scripts/config_whitelist.txt | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 29b08d56ee52..410ae34e9504 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -189,7 +189,7 @@
#define CFG_SYS_NUM_FMAN 1
#define CFG_SYS_NUM_FM1_DTSEC 4
#define CFG_SYS_NUM_FM1_10GEC 1
-#define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#define CFG_FSL_FM_10GEC_REGULAR_NOTATION
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
#define CFG_SYS_FM1_CLK 0
#define CONFIG_QBMAN_CLK_DIV 1
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 283fdf3b458a..05b83952f231 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -1303,7 +1303,7 @@ typedef struct ccsr_gur {
#define FSL_CORENET_DEVDISR2_DTSEC1_6 0x04000000
#define FSL_CORENET_DEVDISR2_DTSEC1_9 0x00800000
#define FSL_CORENET_DEVDISR2_DTSEC1_10 0x00400000
-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION
#define FSL_CORENET_DEVDISR2_10GEC1_1 0x80000000
#define FSL_CORENET_DEVDISR2_10GEC1_2 0x40000000
#else
diff --git a/doc/README.fsl-dpaa b/doc/README.fsl-dpaa
index 3ef5eeb32e11..91c14ad12227 100644
--- a/doc/README.fsl-dpaa
+++ b/doc/README.fsl-dpaa
@@ -1,10 +1,10 @@
This file documents Freescale DPAA-specific options.

FMan (Frame Manager)
- - CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+ - CFG_FSL_FM_10GEC_REGULAR_NOTATION
on SoCs T4240, T2080, LS1043A, etc, the notation between 10GEC and MAC as below:
10GEC1->MAC9, 10GEC2->MAC10, 10GEC3->MAC1, 10GEC4->MAC2
on SoCs T1024, etc, the notation between 10GEC and MAC as below:
10GEC1->MAC1, 10GEC2->MAC2
- so we introduce CONFIG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
+ so we introduce CFG_FSL_FM_10GEC_REGULAR_NOTATION to identify the new SoCs on
which 10GEC enumeration is consistent with MAC enumeration.
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index c8381cc7133c..c84d1c0a713e 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -738,7 +738,7 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg)
num = fm_eth->num;

#ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION
if (fm_eth->type == FM_ETH_10G_E) {
/* 10GEC1/10GEC2 use mEMAC9/mEMAC10 on T2080/T4240.
* 10GEC3/10GEC4 use mEMAC1/mEMAC2 on T2080.
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index 618c1bccbe3f..23a25056f822 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -261,7 +261,7 @@ int ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop)
}

#ifdef CONFIG_SYS_FMAN_V3
-#ifndef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifndef CFG_FSL_FM_10GEC_REGULAR_NOTATION
/*
* On T2/T4 SoCs, physically FM1_DTSEC9 and FM1_10GEC1 use the same
* dual-role MAC, when FM1_10GEC1 is enabled and FM1_DTSEC9
diff --git a/include/fm_eth.h b/include/fm_eth.h
index aeb640925ee2..4f130a8d04a5 100644
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -88,7 +88,7 @@ enum fm_eth_type {
offsetof(struct ccsr_fman, memac[n-1]),\
}

-#ifdef CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+#ifdef CFG_FSL_FM_10GEC_REGULAR_NOTATION
#define FM_TGEC_INFO_INITIALIZER(idx, n) \
{ \
FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 278fc032799a..14823f42e61e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -37,7 +37,7 @@ CFG_FLASH_VERIFY
CFG_FM_PLAT_CLK_DIV
CFG_FSL_CPLD
CFG_FSL_ESDHC_PIN_MUX
-CONFIG_FSL_FM_10GEC_REGULAR_NOTATION
+CFG_FSL_FM_10GEC_REGULAR_NOTATION
CONFIG_FSL_ISBC_KEY_EXT
CONFIG_FSL_PMIC_BITLEN
CONFIG_FSL_PMIC_BUS
--
2.25.1