From 6e2fc66d7a60250f05351fb70ec9b8219593ae94 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 12 Dec 2018 08:51:56 +0000 Subject: Minor Arm updates for NXP i.MX 6/7 series devices --- configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP | 1 - configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP | 2 +- configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP | 1 + kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 8 ++++++-- kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 8 ++++++-- 9 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP create mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP b/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP deleted file mode 100644 index 6b98c7c3f..000000000 --- a/configs/fedora/generic/arm/CONFIG_VIDEO_IMX_PXP +++ /dev/null @@ -1 +0,0 @@ -CONFIG_VIDEO_IMX_PXP=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP index 7e925a191..37f2c81d0 100644 --- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CRYPTO_DEV_MXS_DCP @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_MXS_DCP=m diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP new file mode 100644 index 000000000..6b98c7c3f --- /dev/null +++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_IMX_PXP @@ -0,0 +1 @@ +CONFIG_VIDEO_IMX_PXP=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 00c1331c1..d25d6b845 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6800,7 +6800,6 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 4994dd0c4..01e70c886 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6777,7 +6777,6 @@ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 9b327f82a..05bbcd631 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1136,7 +1136,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set CONFIG_CRYPTO_DEV_MARVELL_CESA=m # CONFIG_CRYPTO_DEV_MXC_SCC is not set -# CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_MXS_DCP=m # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_DES=m @@ -1238,6 +1238,7 @@ CONFIG_DA280=m CONFIG_DA311=m CONFIG_DA9052_WATCHDOG=m CONFIG_DA9055_WATCHDOG=m +CONFIG_DA9063_WATCHDOG=m CONFIG_DAVICOM_PHY=m CONFIG_DAX=y CONFIG_DCB=y @@ -2547,6 +2548,7 @@ CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_DA9052_ONKEY=m CONFIG_INPUT_DA9055_ONKEY=m +CONFIG_INPUT_DA9063_ONKEY=m # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set @@ -3383,7 +3385,7 @@ CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_DA9052_SPI=y CONFIG_MFD_DA9055=y # CONFIG_MFD_DA9062 is not set -# CONFIG_MFD_DA9063 is not set +CONFIG_MFD_DA9063=m # CONFIG_MFD_DA9150 is not set # CONFIG_MFD_DLN2 is not set CONFIG_MFD_EXYNOS_LPASS=m @@ -4962,6 +4964,7 @@ CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD9571MWV=m CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_DA9055=m +CONFIG_REGULATOR_DA9063=m CONFIG_REGULATOR_DA9210=m CONFIG_REGULATOR_DA9211=m # CONFIG_REGULATOR_DEBUG is not set @@ -5132,6 +5135,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_CROS_EC=m CONFIG_RTC_DRV_DA9052=m CONFIG_RTC_DRV_DA9055=m +CONFIG_RTC_DRV_DA9063=m CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 047a2360b..73bb64c4d 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6816,7 +6816,6 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m # CONFIG_VIDEO_IMX_MEDIA is not set -CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 3e0a1f20b..1998d51d7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6794,7 +6794,6 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m # CONFIG_VIDEO_IMX_MEDIA is not set -CONFIG_VIDEO_IMX_PXP=m # CONFIG_VIDEO_IVTV_ALSA is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set CONFIG_VIDEO_IVTV=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e7f7392b6..8e340e4ca 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1136,7 +1136,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y # CONFIG_CRYPTO_DEV_HISI_SEC is not set CONFIG_CRYPTO_DEV_MARVELL_CESA=m # CONFIG_CRYPTO_DEV_MXC_SCC is not set -# CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_MXS_DCP=m # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_DES=m @@ -1238,6 +1238,7 @@ CONFIG_DA280=m CONFIG_DA311=m CONFIG_DA9052_WATCHDOG=m CONFIG_DA9055_WATCHDOG=m +CONFIG_DA9063_WATCHDOG=m CONFIG_DAVICOM_PHY=m CONFIG_DAX=y CONFIG_DCB=y @@ -2531,6 +2532,7 @@ CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_DA9052_ONKEY=m CONFIG_INPUT_DA9055_ONKEY=m +CONFIG_INPUT_DA9063_ONKEY=m # CONFIG_INPUT_DRV260X_HAPTICS is not set # CONFIG_INPUT_DRV2665_HAPTICS is not set # CONFIG_INPUT_DRV2667_HAPTICS is not set @@ -3364,7 +3366,7 @@ CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_DA9052_SPI=y CONFIG_MFD_DA9055=y # CONFIG_MFD_DA9062 is not set -# CONFIG_MFD_DA9063 is not set +CONFIG_MFD_DA9063=m # CONFIG_MFD_DA9150 is not set # CONFIG_MFD_DLN2 is not set CONFIG_MFD_EXYNOS_LPASS=m @@ -4941,6 +4943,7 @@ CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD9571MWV=m CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_DA9055=m +CONFIG_REGULATOR_DA9063=m CONFIG_REGULATOR_DA9210=m CONFIG_REGULATOR_DA9211=m # CONFIG_REGULATOR_DEBUG is not set @@ -5111,6 +5114,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_CROS_EC=m CONFIG_RTC_DRV_DA9052=m CONFIG_RTC_DRV_DA9055=m +CONFIG_RTC_DRV_DA9063=m CONFIG_RTC_DRV_DS1286=m # CONFIG_RTC_DRV_DS1302 is not set CONFIG_RTC_DRV_DS1305=m -- cgit