From 1c98607f418b4e3014a9f386f9398b4a1bd61d38 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 22 Jul 2019 13:27:49 +0100 Subject: [PATCH] arm: part 4 (and the last) of the merge window updates --- configs/fedora/generic/CONFIG_DPAA2_CONSOLE | 1 - configs/fedora/generic/CONFIG_FSL_ENETC | 1 - configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING | 1 - configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK | 1 - configs/fedora/generic/CONFIG_FSL_ENETC_VF | 1 - configs/fedora/generic/CONFIG_IMX_SCU_SOC | 1 - configs/fedora/generic/{ => arm}/CONFIG_NVMEM_SNVS_LPGPR | 0 configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC | 1 + configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE | 1 + .../generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING | 1 + configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC | 1 + configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR | 1 + kernel-aarch64-debug.config | 8 ++++---- kernel-aarch64.config | 8 ++++---- kernel-armv7hl-debug.config | 6 ------ kernel-armv7hl-lpae-debug.config | 8 +------- kernel-armv7hl-lpae.config | 8 +------- kernel-armv7hl.config | 6 ------ kernel-i686-debug.config | 7 ------- kernel-i686.config | 7 ------- kernel-ppc64le-debug.config | 7 ------- kernel-ppc64le.config | 7 ------- kernel-s390x-debug.config | 7 ------- kernel-s390x.config | 7 ------- kernel-x86_64-debug.config | 7 ------- kernel-x86_64.config | 7 ------- 26 files changed, 15 insertions(+), 96 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_DPAA2_CONSOLE delete mode 100644 configs/fedora/generic/CONFIG_FSL_ENETC delete mode 100644 configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING delete mode 100644 configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK delete mode 100644 configs/fedora/generic/CONFIG_FSL_ENETC_VF delete mode 100644 configs/fedora/generic/CONFIG_IMX_SCU_SOC rename configs/fedora/generic/{ => arm}/CONFIG_NVMEM_SNVS_LPGPR (100%) create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC create mode 100644 configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR diff --git a/configs/fedora/generic/CONFIG_DPAA2_CONSOLE b/configs/fedora/generic/CONFIG_DPAA2_CONSOLE deleted file mode 100644 index 474de46bf..000000000 --- a/configs/fedora/generic/CONFIG_DPAA2_CONSOLE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DPAA2_CONSOLE is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC b/configs/fedora/generic/CONFIG_FSL_ENETC deleted file mode 100644 index cbb37c22c..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING deleted file mode 100644 index 21018ddd5..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC_HW_TIMESTAMPING +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK b/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK deleted file mode 100644 index bbc51f2b6..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC_PTP_CLOCK is not set diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_VF b/configs/fedora/generic/CONFIG_FSL_ENETC_VF deleted file mode 100644 index 3501beeab..000000000 --- a/configs/fedora/generic/CONFIG_FSL_ENETC_VF +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FSL_ENETC_VF is not set diff --git a/configs/fedora/generic/CONFIG_IMX_SCU_SOC b/configs/fedora/generic/CONFIG_IMX_SCU_SOC deleted file mode 100644 index 88890780b..000000000 --- a/configs/fedora/generic/CONFIG_IMX_SCU_SOC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_IMX_SCU_SOC is not set diff --git a/configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR similarity index 100% rename from configs/fedora/generic/CONFIG_NVMEM_SNVS_LPGPR rename to configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC b/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC new file mode 100644 index 000000000..b21161a4e --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_AL_FIC @@ -0,0 +1 @@ +CONFIG_AL_FIC=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE b/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE new file mode 100644 index 000000000..01930567e --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_DPAA2_CONSOLE @@ -0,0 +1 @@ +CONFIG_DPAA2_CONSOLE=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING new file mode 100644 index 000000000..3e18eab35 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_HW_TIMESTAMPING @@ -0,0 +1 @@ +CONFIG_FSL_ENETC_HW_TIMESTAMPING=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC new file mode 100644 index 000000000..57c96444a --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU_SOC @@ -0,0 +1 @@ +CONFIG_IMX_SCU_SOC=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR new file mode 100644 index 000000000..21803b106 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SNVS_LPGPR @@ -0,0 +1 @@ +CONFIG_NVMEM_SNVS_LPGPR=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2e83fe713..ba4039ffc 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -181,7 +181,7 @@ CONFIG_AIX_PARTITION=y # CONFIG_AK8974 is not set CONFIG_AK8975=m # CONFIG_AL3320A is not set -# CONFIG_AL_FIC is not set +CONFIG_AL_FIC=y CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y @@ -1422,7 +1422,7 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set +CONFIG_DPAA2_CONSOLE=m CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1905,7 +1905,7 @@ CONFIG_FSL_DPAA2=y CONFIG_FSL_DPAA_ETH=m CONFIG_FSL_DPAA=y CONFIG_FSL_EDMA=m -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set +CONFIG_FSL_ENETC_HW_TIMESTAMPING=y CONFIG_FSL_ENETC=m CONFIG_FSL_ENETC_PTP_CLOCK=m CONFIG_FSL_ENETC_VF=m @@ -2475,7 +2475,7 @@ CONFIG_IMX_GPCV2=y CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m CONFIG_IMX_SCU_PD=y -# CONFIG_IMX_SCU_SOC is not set +CONFIG_IMX_SCU_SOC=y CONFIG_IMX_SCU=y CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index d3ac53b6b..179c5adaa 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -181,7 +181,7 @@ CONFIG_AIX_PARTITION=y # CONFIG_AK8974 is not set CONFIG_AK8975=m # CONFIG_AL3320A is not set -# CONFIG_AL_FIC is not set +CONFIG_AL_FIC=y CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y @@ -1414,7 +1414,7 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m CONFIG_DP83867_PHY=m # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set +CONFIG_DPAA2_CONSOLE=m CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1889,7 +1889,7 @@ CONFIG_FSL_DPAA2=y CONFIG_FSL_DPAA_ETH=m CONFIG_FSL_DPAA=y CONFIG_FSL_EDMA=m -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set +CONFIG_FSL_ENETC_HW_TIMESTAMPING=y CONFIG_FSL_ENETC=m CONFIG_FSL_ENETC_PTP_CLOCK=m CONFIG_FSL_ENETC_VF=m @@ -2459,7 +2459,7 @@ CONFIG_IMX_GPCV2=y CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m CONFIG_IMX_SCU_PD=y -# CONFIG_IMX_SCU_SOC is not set +CONFIG_IMX_SCU_SOC=y CONFIG_IMX_SCU=y CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 9445a179f..9b1c36f6d 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1423,7 +1423,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1941,10 +1940,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_IMX8_DDR_PMU is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2510,7 +2505,6 @@ CONFIG_IMX_IPUV3_CORE=m CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m # CONFIG_IMX_SCU is not set -# CONFIG_IMX_SCU_SOC is not set CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index de1034f79..6881f8886 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1383,7 +1383,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1874,10 +1873,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_IMX8_DDR_PMU is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2426,7 +2421,6 @@ CONFIG_IMX_GPCV2=y # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m # CONFIG_IMX_SCU is not set -# CONFIG_IMX_SCU_SOC is not set CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m # CONFIG_IMX_WEIM is not set @@ -4221,7 +4215,7 @@ CONFIG_NVME_FC=m CONFIG_NVMEM_IMX_IIM=m CONFIG_NVMEM_IMX_OCOTP=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set +CONFIG_NVMEM_SNVS_LPGPR=m CONFIG_NVMEM_STM32_ROMEM=m CONFIG_NVMEM_SUNXI_SID=m CONFIG_NVMEM_SYSFS=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index bfe47843a..81c72796d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1376,7 +1376,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1859,10 +1858,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_IMX8_DDR_PMU is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2411,7 +2406,6 @@ CONFIG_IMX_GPCV2=y # CONFIG_IMX_IRQSTEER is not set CONFIG_IMX_MBOX=m # CONFIG_IMX_SCU is not set -# CONFIG_IMX_SCU_SOC is not set CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m # CONFIG_IMX_WEIM is not set @@ -4202,7 +4196,7 @@ CONFIG_NVME_FC=m CONFIG_NVMEM_IMX_IIM=m CONFIG_NVMEM_IMX_OCOTP=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set +CONFIG_NVMEM_SNVS_LPGPR=m CONFIG_NVMEM_STM32_ROMEM=m CONFIG_NVMEM_SUNXI_SID=m CONFIG_NVMEM_SYSFS=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 1718f7775..869b692f2 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1416,7 +1416,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1926,10 +1925,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_IMX8_DDR_PMU is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2495,7 +2490,6 @@ CONFIG_IMX_IPUV3_CORE=m CONFIG_IMX_MBOX=m CONFIG_IMX_REMOTEPROC=m # CONFIG_IMX_SCU is not set -# CONFIG_IMX_SCU_SOC is not set CONFIG_IMX_SC_WDT=m CONFIG_IMX_SDMA=m CONFIG_IMX_THERMAL=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d6c227081..39c4238a6 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1200,7 +1200,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DPTF_POWER=m @@ -1670,10 +1669,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2217,7 +2212,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3979,7 +3973,6 @@ CONFIG_NULL_TTY=m # CONFIG_NUMA is not set CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-i686.config b/kernel-i686.config index fd9ae2f5b..7164ba155 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1191,7 +1191,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DPTF_POWER=m @@ -1653,10 +1652,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2200,7 +2195,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3960,7 +3954,6 @@ CONFIG_NULL_TTY=m # CONFIG_NUMA is not set CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 9791f6f1c..fdcdd48bf 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1111,7 +1111,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1518,10 +1517,6 @@ CONFIG_FSI_OCC=m CONFIG_FSI_SBEFIFO=m CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_LBC is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2023,7 +2018,6 @@ CONFIG_IMA_READ_POLICY=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3699,7 +3693,6 @@ CONFIG_NUMA_BALANCING=y CONFIG_NUMA=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 9603e92d9..de60a92ed 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1102,7 +1102,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1501,10 +1500,6 @@ CONFIG_FSI_OCC=m CONFIG_FSI_SBEFIFO=m CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_LBC is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set @@ -2006,7 +2001,6 @@ CONFIG_IMA_READ_POLICY=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_WRITE_POLICY=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3678,7 +3672,6 @@ CONFIG_NUMA_BALANCING=y CONFIG_NUMA=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 945dba589..0bc7667a9 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1117,7 +1117,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1517,10 +1516,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2001,7 +1996,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3669,7 +3663,6 @@ CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-s390x.config b/kernel-s390x.config index a52fa39e9..90fb61137 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1108,7 +1108,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DRAGONRISE_FF=y @@ -1500,10 +1499,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -1984,7 +1979,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -3648,7 +3642,6 @@ CONFIG_NUMA_EMU=y CONFIG_NUMA=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 17c1b4641..73535d2e4 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1244,7 +1244,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DPTF_POWER=m @@ -1712,10 +1711,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2262,7 +2257,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4039,7 +4033,6 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 82d548c60..6e0c67b7f 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1235,7 +1235,6 @@ CONFIG_DP83822_PHY=m CONFIG_DP83848_PHY=m # CONFIG_DP83867_PHY is not set # CONFIG_DP83TC811_PHY is not set -# CONFIG_DPAA2_CONSOLE is not set CONFIG_DPOT_DAC=m # CONFIG_DPS310 is not set CONFIG_DPTF_POWER=m @@ -1695,10 +1694,6 @@ CONFIG_FSI_MASTER_HUB=m # CONFIG_FSI_SBEFIFO is not set CONFIG_FSI_SCOM=m # CONFIG_FSL_EDMA is not set -# CONFIG_FSL_ENETC_HW_TIMESTAMPING is not set -# CONFIG_FSL_ENETC is not set -# CONFIG_FSL_ENETC_PTP_CLOCK is not set -# CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set # CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y @@ -2245,7 +2240,6 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set -# CONFIG_IMX_SCU_SOC is not set # CONFIG_INA2XX_ADC is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m @@ -4020,7 +4014,6 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y CONFIG_NVME_FC=m # CONFIG_NVMEM_REBOOT_MODE is not set -# CONFIG_NVMEM_SNVS_LPGPR is not set CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y