summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/fedora/generic/CONFIG_SPI_CADENCE (renamed from configs/fedora/generic/x86/CONFIG_SPI_CADENCE)0
-rw-r--r--configs/fedora/generic/CONFIG_TEGRA_BPMP_THERMAL1
-rw-r--r--configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG2
-rw-r--r--configs/fedora/generic/arm/CONFIG_I2C_CADENCE (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_CADENCE)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SPI_CADENCE2
-rw-r--r--configs/fedora/generic/arm/CONFIG_TEGRA_BPMP2
-rw-r--r--configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX2
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_AHCI_CEVA1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_CADENCE_TTC_TIMER1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_CAN_XILINXCAN1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TPS650861
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_MFD_TPS650861
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_TPS650861
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC1
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE1
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config22
-rw-r--r--kernel-aarch64.config22
-rw-r--r--kernel-armv7hl-debug.config5
-rw-r--r--kernel-armv7hl-lpae-debug.config11
-rw-r--r--kernel-armv7hl-lpae.config11
-rw-r--r--kernel-armv7hl.config5
-rw-r--r--kernel-i686-PAE.config1
-rw-r--r--kernel-i686-PAEdebug.config1
-rw-r--r--kernel-i686-debug.config1
-rw-r--r--kernel-i686.config1
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config1
-rw-r--r--kernel-x86_64.config1
-rw-r--r--kernel.spec8
-rw-r--r--sources1
44 files changed, 71 insertions, 59 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_SPI_CADENCE b/configs/fedora/generic/CONFIG_SPI_CADENCE
index 78e16ec97..78e16ec97 100644
--- a/configs/fedora/generic/x86/CONFIG_SPI_CADENCE
+++ b/configs/fedora/generic/CONFIG_SPI_CADENCE
diff --git a/configs/fedora/generic/CONFIG_TEGRA_BPMP_THERMAL b/configs/fedora/generic/CONFIG_TEGRA_BPMP_THERMAL
deleted file mode 100644
index e1e1b80f4..000000000
--- a/configs/fedora/generic/CONFIG_TEGRA_BPMP_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TEGRA_BPMP_THERMAL is not set
diff --git a/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG b/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG
index 3892db328..85b4e115d 100644
--- a/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG
+++ b/configs/fedora/generic/arm/CONFIG_CADENCE_WATCHDOG
@@ -1 +1 @@
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_CADENCE b/configs/fedora/generic/arm/CONFIG_I2C_CADENCE
index 8e1eefa5c..8e1eefa5c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_I2C_CADENCE
+++ b/configs/fedora/generic/arm/CONFIG_I2C_CADENCE
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_CADENCE b/configs/fedora/generic/arm/CONFIG_SPI_CADENCE
index 78e16ec97..3a8bb168c 100644
--- a/configs/fedora/generic/arm/CONFIG_SPI_CADENCE
+++ b/configs/fedora/generic/arm/CONFIG_SPI_CADENCE
@@ -1 +1 @@
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
diff --git a/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP b/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP
index 348002b0b..9127d3c57 100644
--- a/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP
+++ b/configs/fedora/generic/arm/CONFIG_TEGRA_BPMP
@@ -1 +1 @@
-CONFIG_TEGRA_BPMP=y
+# CONFIG_TEGRA_BPMP is not set
diff --git a/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX b/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX
index 3d46b7c93..54f071b05 100644
--- a/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX
+++ b/configs/fedora/generic/arm/CONFIG_TEGRA_HSP_MBOX
@@ -1 +1 @@
-CONFIG_TEGRA_HSP_MBOX=y
+# CONFIG_TEGRA_HSP_MBOX is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_CEVA b/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_CEVA
new file mode 100644
index 000000000..5186787b5
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_AHCI_CEVA
@@ -0,0 +1 @@
+CONFIG_AHCI_CEVA=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CADENCE_TTC_TIMER b/configs/fedora/generic/arm/aarch64/CONFIG_CADENCE_TTC_TIMER
new file mode 100644
index 000000000..90e2cff83
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CADENCE_TTC_TIMER
@@ -0,0 +1 @@
+CONFIG_CADENCE_TTC_TIMER=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CAN_XILINXCAN b/configs/fedora/generic/arm/aarch64/CONFIG_CAN_XILINXCAN
new file mode 100644
index 000000000..2b494af90
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CAN_XILINXCAN
@@ -0,0 +1 @@
+CONFIG_CAN_XILINXCAN=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TPS65086 b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TPS65086
new file mode 100644
index 000000000..e57ca9d99
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_GPIO_TPS65086
@@ -0,0 +1 @@
+CONFIG_GPIO_TPS65086=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC b/configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC
new file mode 100644
index 000000000..32f6a0524
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_INA2XX_ADC
@@ -0,0 +1 @@
+CONFIG_INA2XX_ADC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_TPS65086 b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_TPS65086
new file mode 100644
index 000000000..bf0208660
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_TPS65086
@@ -0,0 +1 @@
+CONFIG_MFD_TPS65086=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_TPS65086 b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_TPS65086
new file mode 100644
index 000000000..c13204ab2
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_TPS65086
@@ -0,0 +1 @@
+CONFIG_REGULATOR_TPS65086=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART
new file mode 100644
index 000000000..96b1d5471
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART
@@ -0,0 +1 @@
+CONFIG_SERIAL_XILINX_PS_UART=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
new file mode 100644
index 000000000..6bf59901d
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
@@ -0,0 +1 @@
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP
new file mode 100644
index 000000000..348002b0b
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP
@@ -0,0 +1 @@
+CONFIG_TEGRA_BPMP=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL
new file mode 100644
index 000000000..41b5a2ab5
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_BPMP_THERMAL
@@ -0,0 +1 @@
+CONFIG_TEGRA_BPMP_THERMAL=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX
new file mode 100644
index 000000000..3d46b7c93
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_HSP_MBOX
@@ -0,0 +1 @@
+CONFIG_TEGRA_HSP_MBOX=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC b/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC
deleted file mode 100644
index cdcacbec2..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_TEGRA_IVC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEGRA_IVC=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC b/configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC
deleted file mode 100644
index cdcacbec2..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_TEGRA_IVC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TEGRA_IVC=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG b/configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
deleted file mode 100644
index 85b4e115d..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_CADENCE_WATCHDOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CADENCE_WATCHDOG=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE
deleted file mode 100644
index 3a8bb168c..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SPI_CADENCE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_CADENCE=m
diff --git a/gitrev b/gitrev
index 9ed51712f..e367fb2da 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-60cc43fc888428bb2f18f08997432d426a243338
+a27fc14219f2e3c4a46ba9177b04d9b52c875532
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b414301fa..6af1f95dd 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -151,7 +151,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_AF_KCM is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_AFS_FS is not set
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
CONFIG_AHCI_MVEBU=m
# CONFIG_AHCI_QORIQ is not set
CONFIG_AHCI_SUNXI=m
@@ -721,7 +721,8 @@ CONFIG_BUILD_DOCSRC=y
# CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_HISTOGRAM is not set
CONFIG_CACHEFILES=m
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_TTC_TIMER=y
+CONFIG_CADENCE_WATCHDOG=m
# CONFIG_CAIF is not set
CONFIG_CAN_8DEV_USB=m
CONFIG_CAN_BCM=m
@@ -767,7 +768,7 @@ CONFIG_CAN_SUN4I=m
# CONFIG_CAN_TSCAN1 is not set
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
-# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_XILINXCAN=m
CONFIG_CAPI_AVM=y
# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
@@ -1850,6 +1851,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
CONFIG_GPIO_TEGRA=y
CONFIG_GPIO_THUNDERX=m
# CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS68470=y
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
@@ -2102,7 +2104,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
# CONFIG_I2C_BCM2048 is not set
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_COMPAT=y
@@ -2256,7 +2258,7 @@ CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
# CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
CONFIG_INDIRECT_PIO=y
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3161,7 +3163,7 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TI_LP873X is not set
# CONFIG_MFD_TI_LP87565 is not set
# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TPS65086 is not set
+CONFIG_MFD_TPS65086=m
# CONFIG_MFD_TPS65090 is not set
# CONFIG_MFD_TPS65217 is not set
# CONFIG_MFD_TPS65218 is not set
@@ -4567,6 +4569,7 @@ CONFIG_REGULATOR_RK808=m
# CONFIG_REGULATOR_TPS62360 is not set
# CONFIG_REGULATOR_TPS65023 is not set
# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_TPS65086=m
# CONFIG_REGULATOR_TPS65132 is not set
# CONFIG_REGULATOR_TPS6524X is not set
CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -5193,7 +5196,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_AMBAKMI=m
# CONFIG_SERIO_APBPS2 is not set
@@ -5627,7 +5631,7 @@ CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
# CONFIG_SPI_DW_MID_DMA is not set
@@ -5826,7 +5830,7 @@ CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA210_ADMA=y
CONFIG_TEGRA_ACONNECT=m
CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_BPMP_THERMAL is not set
+CONFIG_TEGRA_BPMP_THERMAL=m
CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index fd8c44d2c..0a288e8c4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -151,7 +151,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_AF_KCM is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_AFS_FS is not set
-# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_CEVA=m
CONFIG_AHCI_MVEBU=m
# CONFIG_AHCI_QORIQ is not set
CONFIG_AHCI_SUNXI=m
@@ -721,7 +721,8 @@ CONFIG_BUILD_DOCSRC=y
# CONFIG_CACHEFILES_DEBUG is not set
# CONFIG_CACHEFILES_HISTOGRAM is not set
CONFIG_CACHEFILES=m
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_TTC_TIMER=y
+CONFIG_CADENCE_WATCHDOG=m
# CONFIG_CAIF is not set
CONFIG_CAN_8DEV_USB=m
CONFIG_CAN_BCM=m
@@ -767,7 +768,7 @@ CONFIG_CAN_SUN4I=m
# CONFIG_CAN_TSCAN1 is not set
CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m
-# CONFIG_CAN_XILINXCAN is not set
+CONFIG_CAN_XILINXCAN=m
CONFIG_CAPI_AVM=y
# CONFIG_CAPI_EICON is not set
# CONFIG_CAPI_TRACE is not set
@@ -1832,6 +1833,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=m
CONFIG_GPIO_TEGRA=y
CONFIG_GPIO_THUNDERX=m
# CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS68470=y
# CONFIG_GPIO_TS4900 is not set
# CONFIG_GPIO_TS5500 is not set
@@ -2084,7 +2086,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
# CONFIG_I2C_BCM2048 is not set
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_COMPAT=y
@@ -2238,7 +2240,7 @@ CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
# CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_INA2XX_ADC is not set
+CONFIG_INA2XX_ADC=m
CONFIG_INDIRECT_PIO=y
CONFIG_INET6_AH=m
CONFIG_INET6_ESP=m
@@ -3140,7 +3142,7 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TI_LP873X is not set
# CONFIG_MFD_TI_LP87565 is not set
# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TPS65086 is not set
+CONFIG_MFD_TPS65086=m
# CONFIG_MFD_TPS65090 is not set
# CONFIG_MFD_TPS65217 is not set
# CONFIG_MFD_TPS65218 is not set
@@ -4544,6 +4546,7 @@ CONFIG_REGULATOR_RK808=m
# CONFIG_REGULATOR_TPS62360 is not set
# CONFIG_REGULATOR_TPS65023 is not set
# CONFIG_REGULATOR_TPS6507X is not set
+CONFIG_REGULATOR_TPS65086=m
# CONFIG_REGULATOR_TPS65132 is not set
# CONFIG_REGULATOR_TPS6524X is not set
CONFIG_REGULATOR_USERSPACE_CONSUMER=m
@@ -5170,7 +5173,8 @@ CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_TEGRA=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_UARTLITE is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_AMBAKMI=m
# CONFIG_SERIO_APBPS2 is not set
@@ -5603,7 +5607,7 @@ CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_DESIGNWARE=m
# CONFIG_SPI_DW_MID_DMA is not set
@@ -5802,7 +5806,7 @@ CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA210_ADMA=y
CONFIG_TEGRA_ACONNECT=m
CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_BPMP_THERMAL is not set
+CONFIG_TEGRA_BPMP_THERMAL=m
CONFIG_TEGRA_BPMP=y
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d1528e656..09b1cbdd6 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6272,12 +6272,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA20_MC=y
CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_BPMP_THERMAL is not set
-CONFIG_TEGRA_BPMP=y
+# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HSP_MBOX=y
+# CONFIG_TEGRA_HSP_MBOX is not set
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8600d6131..53d1c59a0 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -734,7 +734,7 @@ CONFIG_CACHEFILES=m
CONFIG_CACHE_L2X0_PMU=y
CONFIG_CACHE_L2X0=y
CONFIG_CACHE_TAUROS2=y
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
# CONFIG_CAIF is not set
CONFIG_CAN_8DEV_USB=m
CONFIG_CAN_BCM=m
@@ -2110,7 +2110,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
# CONFIG_I2C_BCM2048 is not set
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_COMPAT=y
@@ -5669,7 +5669,7 @@ CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DAVINCI=m
# CONFIG_SPI_DEBUG is not set
@@ -5872,12 +5872,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
# CONFIG_TEGRA20_MC is not set
CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_BPMP_THERMAL is not set
-CONFIG_TEGRA_BPMP=y
+# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HSP_MBOX=y
+# CONFIG_TEGRA_HSP_MBOX is not set
# CONFIG_TEGRA_IOMMU_GART is not set
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 5f3429498..0fba79caf 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -733,7 +733,7 @@ CONFIG_CACHEFILES=m
CONFIG_CACHE_L2X0_PMU=y
CONFIG_CACHE_L2X0=y
CONFIG_CACHE_TAUROS2=y
-# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_CADENCE_WATCHDOG=m
# CONFIG_CAIF is not set
CONFIG_CAN_8DEV_USB=m
CONFIG_CAN_BCM=m
@@ -2092,7 +2092,7 @@ CONFIG_I2C_ARB_GPIO_CHALLENGE=m
# CONFIG_I2C_BCM2048 is not set
CONFIG_I2C_BCM2835=m
CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CADENCE is not set
+CONFIG_I2C_CADENCE=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_COMPAT=y
@@ -5645,7 +5645,7 @@ CONFIG_SPI_BCM2835=m
# CONFIG_SPI_BCM_QSPI is not set
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
-# CONFIG_SPI_CADENCE is not set
+CONFIG_SPI_CADENCE=m
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_DAVINCI=m
# CONFIG_SPI_DEBUG is not set
@@ -5848,12 +5848,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
# CONFIG_TEGRA20_MC is not set
CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_BPMP_THERMAL is not set
-CONFIG_TEGRA_BPMP=y
+# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HSP_MBOX=y
+# CONFIG_TEGRA_HSP_MBOX is not set
# CONFIG_TEGRA_IOMMU_GART is not set
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index a5d71767e..33d140d78 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6248,12 +6248,11 @@ CONFIG_TEGRA124_EMC=y
CONFIG_TEGRA20_APB_DMA=y
CONFIG_TEGRA20_MC=y
CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_BPMP_THERMAL is not set
-CONFIG_TEGRA_BPMP=y
+# CONFIG_TEGRA_BPMP is not set
CONFIG_TEGRA_GMI=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HSP_MBOX=y
+# CONFIG_TEGRA_HSP_MBOX is not set
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_TEGRA_IVC=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7be4d70b7..87b065743 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -5444,7 +5444,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 391a74e10..d7b9ab84c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -5467,7 +5467,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 818cda9e4..867ad3d79 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5467,7 +5467,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-i686.config b/kernel-i686.config
index f6c9bc459..5afd0ec5e 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5444,7 +5444,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 55dfb5150..45c54e3ff 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -5075,6 +5075,7 @@ CONFIG_SPARSE_RCU_POINTER=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
@@ -5234,7 +5235,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index f1030b5b5..28a0b0271 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -5050,6 +5050,7 @@ CONFIG_SPARSE_RCU_POINTER=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
@@ -5209,7 +5210,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 6088ed68d..98454b390 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5003,6 +5003,7 @@ CONFIG_SPARSE_RCU_POINTER=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
@@ -5162,7 +5163,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 684b9d941..e02a91f6a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4978,6 +4978,7 @@ CONFIG_SPARSE_RCU_POINTER=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
@@ -5137,7 +5138,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 13c1af054..7366eb465 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4898,6 +4898,7 @@ CONFIG_SPARSE_RCU_POINTER=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
@@ -5056,7 +5057,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c5e66d375..6e63791c1 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4873,6 +4873,7 @@ CONFIG_SPARSE_RCU_POINTER=y
# CONFIG_SPI_AXI_SPI_ENGINE is not set
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_CADENCE is not set
# CONFIG_SPI_DEBUG is not set
# CONFIG_SPI_DESIGNWARE is not set
CONFIG_SPI_FSL_LPSPI=m
@@ -5031,7 +5032,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e01092b76..5e8ecd13c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5558,7 +5558,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 32e236744..3bc84751e 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5535,7 +5535,6 @@ CONFIG_TCP_MD5SIG=y
# CONFIG_TCS3414 is not set
# CONFIG_TCS3472 is not set
# CONFIG_TEE is not set
-# CONFIG_TEGRA_BPMP_THERMAL is not set
CONFIG_TEHUTI=m
CONFIG_TELCLOCK=m
CONFIG_TERANETICS_PHY=m
diff --git a/kernel.spec b/kernel.spec
index 3c098a124..b78737c5d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 1
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1882,6 +1882,12 @@ fi
#
#
%changelog
+* Tue Apr 17 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable drivers for Xilinx ZYMQ-MP Ultra96
+
+* Tue Apr 17 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git1.1
+- Linux v4.17-rc1-21-ga27fc14219f2
+- Reenable debugging options.
* Mon Apr 16 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git0.1
- Linux v4.17-rc1
diff --git a/sources b/sources
index aa759b209..4e57ebce1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
SHA512 (patch-4.17-rc1.xz) = a66f90c43b2855142711e80f2df61366bdb5dbe0ed257f549b36bb173f5f24fa87b6293ac284d00cb3c92f5708dbed5214313f8a31c6a98fa5cad29db9d4ad25
+SHA512 (patch-4.17-rc1-git1.xz) = bde6e142a0cfca439c9f6e8dff50a8889d281214099dc4200e5075a6ced04a4c7041e17ad45029e2cceb2bfc52a6f0cf57428407a3180b21cee2b80c2bbeff55