[PATCH 1/7] ARM: configs: sunxi: Run savedefconfig

[Chen-Yu Tsai]

On Sun, Jul 5, 2020 at 5:19 PM Maxime Ripard <maxime at cerno.tech> wrote:
>
> We haven't run savedefconfig for a while and some options have moved
> around. In order to ease the patch application / conflict resolution, let's
> run it.
>
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>
> ---
>  arch/arm/configs/sunxi_defconfig | 22 +++++++---------------
>  1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
> index b105ce7120cc..aff901a7c00e 100644
> --- a/arch/arm/configs/sunxi_defconfig
> +++ b/arch/arm/configs/sunxi_defconfig
> @@ -3,20 +3,19 @@ CONFIG_HIGH_RES_TIMERS=y
>  CONFIG_CGROUPS=y
>  CONFIG_BLK_DEV_INITRD=y
>  CONFIG_PERF_EVENTS=y
> -CONFIG_MODULES=y
> -CONFIG_MODULE_UNLOAD=y
>  CONFIG_ARCH_SUNXI=y
>  CONFIG_SMP=y
>  CONFIG_NR_CPUS=8
> -CONFIG_AEABI=y
>  CONFIG_HIGHMEM=y
> -CONFIG_CMA=y
>  CONFIG_ARM_APPENDED_DTB=y
>  CONFIG_ARM_ATAG_DTB_COMPAT=y
>  CONFIG_CPU_FREQ=y
>  CONFIG_CPUFREQ_DT=y
>  CONFIG_VFP=y
>  CONFIG_NEON=y
> +CONFIG_MODULES=y
> +CONFIG_MODULE_UNLOAD=y
> +CONFIG_CMA=y
>  CONFIG_NET=y
>  CONFIG_PACKET=y
>  CONFIG_UNIX=y
> @@ -24,9 +23,6 @@ CONFIG_INET=y
>  CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_DHCP=y
>  CONFIG_IP_PNP_BOOTP=y
> -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
> -# CONFIG_INET_XFRM_MODE_TUNNEL is not set
> -# CONFIG_INET_XFRM_MODE_BEET is not set
>  # CONFIG_INET_DIAG is not set
>  # CONFIG_IPV6 is not set
>  CONFIG_CAN=y
> @@ -34,14 +30,12 @@ CONFIG_CAN_SUN4I=y
>  # CONFIG_WIRELESS is not set
>  CONFIG_DEVTMPFS=y
>  CONFIG_DEVTMPFS_MOUNT=y
> -CONFIG_DMA_CMA=y
>  CONFIG_BLK_DEV_SD=y
>  CONFIG_ATA=y
>  CONFIG_AHCI_SUNXI=y
>  CONFIG_NETDEVICES=y
>  CONFIG_SUN4I_EMAC=y
>  # CONFIG_NET_VENDOR_ARC is not set
> -# CONFIG_NET_CADENCE is not set
>  # CONFIG_NET_VENDOR_BROADCOM is not set
>  # CONFIG_NET_VENDOR_CIRRUS is not set
>  # CONFIG_NET_VENDOR_FARADAY is not set
> @@ -95,10 +89,10 @@ CONFIG_REGULATOR=y
>  CONFIG_REGULATOR_FIXED_VOLTAGE=y
>  CONFIG_REGULATOR_AXP20X=y
>  CONFIG_REGULATOR_GPIO=y
> -CONFIG_MEDIA_SUPPORT=y
>  CONFIG_RC_CORE=y
>  CONFIG_RC_DEVICES=y
>  CONFIG_IR_SUNXI=y
> +CONFIG_MEDIA_SUPPORT=y
>  CONFIG_DRM=y
>  CONFIG_DRM_SUN4I=y
>  CONFIG_DRM_SIMPLE_BRIDGE=y
> @@ -133,14 +127,12 @@ CONFIG_RTC_DRV_SUNXI=y
>  CONFIG_DMADEVICES=y
>  CONFIG_DMA_SUN6I=y
>  # CONFIG_IOMMU_SUPPORT is not set
> -CONFIG_EXTCON=y
>  CONFIG_IIO=y
>  CONFIG_AXP20X_ADC=y
>  CONFIG_PWM=y
>  CONFIG_PWM_SUN4I=y
>  CONFIG_PHY_SUN4I_USB=y
>  CONFIG_PHY_SUN9I_USB=y
> -CONFIG_NVMEM=y
>  CONFIG_NVMEM_SUNXI_SID=y
>  CONFIG_EXT4_FS=y
>  CONFIG_VFAT_FS=y
> @@ -151,8 +143,8 @@ CONFIG_NFS_V4=y
>  CONFIG_ROOT_NFS=y
>  CONFIG_NLS_CODEPAGE_437=y
>  CONFIG_NLS_ISO8859_1=y
> +CONFIG_CRYPTO_DEV_SUN4I_SS=y
> +CONFIG_CRYPTO_DEV_SUN8I_CE=y

In addition, we could also enable CRYPTO_DEV_SUN8I_SS.
This is the A80/A83T variant.

But for this series, everything looks good to me.

Acked-by: Chen-Yu Tsai <wens at csie.org>

> +CONFIG_DMA_CMA=y
>  CONFIG_PRINTK_TIME=y
>  CONFIG_DEBUG_FS=y
> -CONFIG_CRYPTO_DEV_ALLWINNER=y
> -CONFIG_CRYPTO_DEV_SUN8I_CE=y
> -CONFIG_CRYPTO_DEV_SUN4I_SS=y
> --
> 2.26.2
>