diff options
| author | Mandy Lavi <mandy.lavi@freescale.com> | 2015-02-15 13:20:15 (GMT) |
|---|---|---|
| committer | Honghua Yin <Hong-Hua.Yin@freescale.com> | 2015-03-23 02:53:41 (GMT) |
| commit | ec7f1bf74013559bae9fd7740f990a563c7b09b0 (patch) | |
| tree | a61a922981b55f970a2bda44b0db2b6cc2368793 /arch | |
| parent | d3c5a53142adb4ab63124db696c3428bc3c96de9 (diff) | |
| download | linux-fsl-qoriq-ec7f1bf74013559bae9fd7740f990a563c7b09b0.tar.xz | |
fmd: create new config flavor for FManV3L
CONFIG_FMAN_T4240 was eliminated
Instead, there are now two flags representing FmanV3:
CONFIG_FMAN_V3H for FmanV3H arch and
CONFIG_FMAN_V3L for FmanV3L arch.
FmanV3H h/w block is integrated in B4860, B4420, T4240, T4160, T2080 etc
FmanV3L h/w block is integrated in T1040, T1024, T1020, T1022 etc
defconfig files changes:
corenet64_fmanv3_smp_defconfig -> corenet64_fmanv3l_smp_defconfig
corenet32_fmanv3_smp_defconfig -> corenet32_fmanv3l_smp_defconfig
85xx/e6500rev2_defconfig -> corenet64_fmanv3h_smp_defconfig
Change-Id: I9fcfb454bc3bd2d72c5d55c616400a808e181413
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/30539
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig (renamed from arch/powerpc/configs/corenet32_fmanv3_smp_defconfig) | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig (renamed from arch/powerpc/configs/85xx/e6500rev2_defconfig) | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig (renamed from arch/powerpc/configs/corenet64_fmanv3_smp_defconfig) | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig b/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig index df6f744..7fe07c4 100644 --- a/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig +++ b/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig @@ -104,7 +104,6 @@ CONFIG_PATA_SIL680=y CONFIG_NETDEVICES=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_XGMAC_MDIO=y -CONFIG_FMAN_T4240=y CONFIG_FMAN_V3L=y CONFIG_FSL_DPAA_ETH=y CONFIG_E1000=y diff --git a/arch/powerpc/configs/85xx/e6500rev2_defconfig b/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig index 53f9761..e51b8a8 100644 --- a/arch/powerpc/configs/85xx/e6500rev2_defconfig +++ b/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig @@ -104,7 +104,7 @@ CONFIG_MD_RAID456=y CONFIG_MULTICORE_RAID456=y CONFIG_NETDEVICES=y CONFIG_FSL_XGMAC_MDIO=y -CONFIG_FMAN_T4240=y +CONFIG_FMAN_V3H=y CONFIG_FSL_DPAA_ETH=y CONFIG_E1000E=y CONFIG_FSL_10GBASE_KR=y diff --git a/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig b/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig index 984889a..034db07 100644 --- a/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig +++ b/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig @@ -109,7 +109,6 @@ CONFIG_NETDEVICES=y CONFIG_DUMMY=y CONFIG_FSL_PQ_MDIO=y CONFIG_FSL_XGMAC_MDIO=y -CONFIG_FMAN_T4240=y CONFIG_FMAN_V3L=y CONFIG_FSL_DPAA_ETH=y CONFIG_E1000E=y |