[PATCH] defconfig: Update hulk_defconfig in default - Kernel

24 Jul 2020

From: Hanjun Guo guohanjun@huawei.com
hulk inclusion
category: cleanup
bugzilla: NA
CVE: NA
---------------------------
When some patches are merged, the config file wasn't updated,
so update them all together, no functional change.
Signed-off-by: Hanjun Guo guohanjun@huawei.com
Signed-off-by: Yang Yingliang yangyingliang@huawei.com
---
 arch/arm64/configs/hulk_defconfig | 39 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig
index 4580f4a82635..488ea95474e7 100644
--- a/arch/arm64/configs/hulk_defconfig
+++ b/arch/arm64/configs/hulk_defconfig
@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.25 Kernel Configuration
+# Linux/arm64 4.19.132 Kernel Configuration
 #
#
-# Compiler: gcc (GCC) 6.3.0
+# Compiler: gcc (GCC) 7.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=60300
+CONFIG_GCC_VERSION=70300
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -145,8 +146,8 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
-CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_STEAL=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
@@ -178,6 +179,7 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
+CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -279,8 +281,6 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y
-CONFIG_SOC_HISILICON_SYSCTL=m
-CONFIG_SOC_HISILICON_LBC=m
#
 # Enable Livepatch
@@ -355,10 +355,10 @@ CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCI_HISI=y
-CONFIG_HISILICON_PCIE_CAE=m
 # CONFIG_PCIE_QCOM is not set
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCIE_HISI_STB is not set
+CONFIG_HISILICON_PCIE_CAE=m
#
 # PCI Endpoint
@@ -420,7 +420,6 @@ CONFIG_NUMA_AWARE_SPINLOCKS=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_COHERENT_DEVICE=y
 CONFIG_HOLES_IN_ZONE=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -557,7 +556,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # CONFIG_CPUFREQ_DT is not set
 CONFIG_ACPI_CPPC_CPUFREQ=y
-CONFIG_HISILICON_CPPC_CPUFREQ_WORKAROUND=y
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 CONFIG_ARM_SCPI_CPUFREQ=m
 # CONFIG_QORIQ_CPUFREQ is not set
@@ -573,8 +571,8 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=m
 CONFIG_ARM_SDE_INTERFACE=y
 CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
-CONFIG_FW_CFG_SYSFS=y
 # CONFIG_ISCSI_IBFT is not set
+CONFIG_FW_CFG_SYSFS=y
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set
@@ -643,6 +641,7 @@ CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_CONFIGFS is not set
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_MPAM=y
 CONFIG_ACPI_PPTT=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
@@ -678,7 +677,6 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_CRC32_ARM64_CE=m
 CONFIG_CRYPTO_AES_ARM64=y
 CONFIG_CRYPTO_AES_ARM64_CE=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
@@ -720,6 +718,7 @@ CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_HAVE_RCU_TABLE_INVALIDATE=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -932,6 +931,8 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_MEMBLOCK_PFN_VALID=y
+CONFIG_COHERENT_DEVICE=y
 CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_MEMORY_HOTPLUG=y
@@ -1757,6 +1758,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
@@ -1793,7 +1795,6 @@ CONFIG_MTD=m
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_OF_PARTS=m
-CONFIG_MTD_HISILICON_SFC=m
 # CONFIG_MTD_AR7_PARTS is not set
#
@@ -1879,6 +1880,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_BLOCK is not set
+CONFIG_MTD_HISILICON_SFC=m
 CONFIG_DTC=y
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
@@ -2914,7 +2916,6 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_HISI=y
 CONFIG_HW_RANDOM_XGENE=y
 CONFIG_HW_RANDOM_CAVIUM=y
-# CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
#
@@ -2939,6 +2940,7 @@ CONFIG_TCG_CRB=y
 # CONFIG_DEVPORT is not set
 # CONFIG_XILLYBUS is not set
 CONFIG_HISI_SVM=y
+
 #
 # I2C support
 #
@@ -3686,10 +3688,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -4081,7 +4083,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
-# CONFIG_USB_RIO500 is not set
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
 # CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -4494,7 +4495,6 @@ CONFIG_VFIO_PLATFORM=m
 # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
 CONFIG_VFIO_MDEV=m
 CONFIG_VFIO_MDEV_DEVICE=m
-CONFIG_VFIO_SPIMDEV=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_MENU=y
@@ -4650,6 +4650,8 @@ CONFIG_SMMU_BYPASS_DEV=y
 # Xilinx SoC drivers
 #
 # CONFIG_XILINX_VCU is not set
+CONFIG_SOC_HISILICON_LBC=m
+CONFIG_SOC_HISILICON_SYSCTL=m
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=y
@@ -4862,7 +4864,6 @@ CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_NTFS_FS is not set
#
 # Pseudo filesystems
@@ -5286,7 +5287,6 @@ CONFIG_CRYPTO_DEV_HISI_QM=m
 CONFIG_CRYPTO_QM_UACCE=y
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
 CONFIG_CRYPTO_DEV_HISI_HPRE=m
-CONFIG_CRYPTO_HISI_SGL=m
 CONFIG_CRYPTO_DEV_HISI_SEC2=m
 CONFIG_CRYPTO_DEV_HISI_RDE=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -5336,6 +5336,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 CONFIG_CRC8=m
+CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
-- 
2.25.1

    