[linux-yocto] [kernel-cache] [yocto-4.12] [PATCH] bsp/axxiaarm*: Change LSI references to AXXIA

[Bruce Ashfield]

merged.

Bruce

On 04/19/2018 02:54 PM, Daniel Dragomir wrote:
> Also, disable PPS support for axxiarm BSP.
> 
> Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
> ---
>   bsp/axxiaarm/axxiaarm.cfg     | 17 ++++++++---------
>   bsp/axxiaarm/edac.cfg         |  2 +-
>   bsp/axxiaarm64/axxiaarm64.cfg |  6 +++---
>   bsp/axxiaarm64/edac.cfg       |  2 +-
>   4 files changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/bsp/axxiaarm/axxiaarm.cfg b/bsp/axxiaarm/axxiaarm.cfg
> index c3c8926..e2b4a11 100644
> --- a/bsp/axxiaarm/axxiaarm.cfg
> +++ b/bsp/axxiaarm/axxiaarm.cfg
> @@ -137,8 +137,8 @@ CONFIG_BLK_DEV_LOOP=y
>   #
>   # Misc devices
>   #
> -CONFIG_LSI_MTC=y
> -CONFIG_LSI_NCR=y
> +CONFIG_AXXIA_MTC=y
> +CONFIG_AXXIA_NCR=y
>   CONFIG_ATA=y
>   CONFIG_AXXIA_FAULT=y
>   CONFIG_AXXIA_MDIO=y
> @@ -180,7 +180,6 @@ CONFIG_I2C_AXXIA=y
>   CONFIG_SPI=y
>   CONFIG_SPI_PL022=y
>   
> -CONFIG_PPS=y
>   CONFIG_NETWORK_PHY_TIMESTAMPING=y
>   
>   #
> @@ -198,11 +197,11 @@ CONFIG_ARM_SP805_WATCHDOG=y
>   # Distributed Switch Architecture drivers
>   #
>   CONFIG_ETHERNET=y
> -CONFIG_LSI_NET=y
> -CONFIG_LSI_NET_NUM_RX_DESC=32
> -CONFIG_LSI_NET_RX_BUF_SZ=131072
> -CONFIG_LSI_NET_NUM_TX_DESC=32
> -CONFIG_LSI_NET_TX_BUF_SZ=131072
> +CONFIG_AXXIA_NET=y
> +CONFIG_AXXIA_NET_NUM_RX_DESC=32
> +CONFIG_AXXIA_NET_RX_BUF_SZ=131072
> +CONFIG_AXXIA_NET_NUM_TX_DESC=32
> +CONFIG_AXXIA_NET_TX_BUF_SZ=131072
>   CONFIG_SMC91X=y
>   
>   #
> @@ -243,7 +242,7 @@ CONFIG_USB_CI13612_HCD=y
>   # DMA Devices
>   #
>   CONFIG_DMADEVICES=y
> -CONFIG_LSI_DMA=y
> +CONFIG_AXXIA_DMA=y
>   CONFIG_PL330_DMA=y
>   
>   #
> diff --git a/bsp/axxiaarm/edac.cfg b/bsp/axxiaarm/edac.cfg
> index fac2726..8e13c90 100644
> --- a/bsp/axxiaarm/edac.cfg
> +++ b/bsp/axxiaarm/edac.cfg
> @@ -18,4 +18,4 @@ CONFIG_EDAC_AXXIA_L3=y
>   CONFIG_EDAC_AXXIA_L3_5500=y
>   CONFIG_EDAC_AXXIA_L2_CPU_5500=y
>   
> -# CONFIG_LSI_SMMON is not set
> +# CONFIG_AXXIA_SMMON is not set
> diff --git a/bsp/axxiaarm64/axxiaarm64.cfg b/bsp/axxiaarm64/axxiaarm64.cfg
> index b76b3f6..1e7cda6 100644
> --- a/bsp/axxiaarm64/axxiaarm64.cfg
> +++ b/bsp/axxiaarm64/axxiaarm64.cfg
> @@ -94,9 +94,9 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
>   #
>   # Misc devices
>   #
> -CONFIG_LSI_MTC=y
> +CONFIG_AXXIA_MTC=y
>   CONFIG_ATA=y
> -CONFIG_LSI_NCR=y
> +CONFIG_AXXIA_NCR=y
>   CONFIG_ARCH_AXXIA_NCR_RESET_CHECK=y
>   CONFIG_AXXIA_OEM=y
>   CONFIG_AXXIA_PEI=y
> @@ -232,7 +232,7 @@ CONFIG_RTC_DRV_EFI=y
>   CONFIG_RTC_DRV_XGENE=y
>   
>   CONFIG_DMADEVICES=y
> -CONFIG_LSI_DMA=y
> +CONFIG_AXXIA_DMA=y
>   # CONFIG_IOMMU_SUPPORT is not set
>   
>   #
> diff --git a/bsp/axxiaarm64/edac.cfg b/bsp/axxiaarm64/edac.cfg
> index b5e25b0..b2e94f9 100644
> --- a/bsp/axxiaarm64/edac.cfg
> +++ b/bsp/axxiaarm64/edac.cfg
> @@ -19,4 +19,4 @@ CONFIG_EDAC_AXXIA_CMEM_5600=y
>   CONFIG_EDAC_AXXIA_L3_5600=y
>   CONFIG_EDAC_AXXIA_L2_CPU_5600=y
>   
> -# CONFIG_LSI_SMMON is not set
> +# CONFIG_AXXIA_SMMON is not set
>