Skip to content

Commit 53b64be

Browse files
github-actions[bot]bmastbergen
authored andcommitted
[CIQ] v6.18.3 - rebased configs
CONFIG_SPI_MICROCHIP_CORE is no longer a valid config option in 6.18.3 spi: microchip: rename driver file and internal identifiers Upstream 71c814e
1 parent 00667cf commit 53b64be

6 files changed

Lines changed: 6 additions & 12 deletions

ciq/configs/kernel-aarch64-64k-debug.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.18.2 Kernel Configuration
3+
# Linux/arm64 6.18.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -4204,7 +4204,6 @@ CONFIG_SPI_NXP_FLEXSPI=m
42044204
CONFIG_SPI_IMX=m
42054205
# CONFIG_SPI_FSL_SPI is not set
42064206
CONFIG_SPI_FSL_DSPI=y
4207-
# CONFIG_SPI_MICROCHIP_CORE is not set
42084207
# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
42094208
# CONFIG_SPI_OC_TINY is not set
42104209
CONFIG_SPI_OMAP24XX=m

ciq/configs/kernel-aarch64-64k.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.18.2 Kernel Configuration
3+
# Linux/arm64 6.18.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -4187,7 +4187,6 @@ CONFIG_SPI_NXP_FLEXSPI=m
41874187
CONFIG_SPI_IMX=m
41884188
# CONFIG_SPI_FSL_SPI is not set
41894189
CONFIG_SPI_FSL_DSPI=y
4190-
# CONFIG_SPI_MICROCHIP_CORE is not set
41914190
# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
41924191
# CONFIG_SPI_OC_TINY is not set
41934192
CONFIG_SPI_OMAP24XX=m

ciq/configs/kernel-aarch64-debug.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.18.2 Kernel Configuration
3+
# Linux/arm64 6.18.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -4208,7 +4208,6 @@ CONFIG_SPI_NXP_FLEXSPI=m
42084208
CONFIG_SPI_IMX=m
42094209
# CONFIG_SPI_FSL_SPI is not set
42104210
CONFIG_SPI_FSL_DSPI=y
4211-
# CONFIG_SPI_MICROCHIP_CORE is not set
42124211
# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
42134212
# CONFIG_SPI_OC_TINY is not set
42144213
CONFIG_SPI_OMAP24XX=m

ciq/configs/kernel-aarch64.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.18.2 Kernel Configuration
3+
# Linux/arm64 6.18.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -4191,7 +4191,6 @@ CONFIG_SPI_NXP_FLEXSPI=m
41914191
CONFIG_SPI_IMX=m
41924192
# CONFIG_SPI_FSL_SPI is not set
41934193
CONFIG_SPI_FSL_DSPI=y
4194-
# CONFIG_SPI_MICROCHIP_CORE is not set
41954194
# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
41964195
# CONFIG_SPI_OC_TINY is not set
41974196
CONFIG_SPI_OMAP24XX=m

ciq/configs/kernel-x86_64-debug.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.18.2 Kernel Configuration
3+
# Linux/x86_64 6.18.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -4196,7 +4196,6 @@ CONFIG_SPI_CS42L43=m
41964196
# CONFIG_SPI_GPIO is not set
41974197
# CONFIG_SPI_LM70_LLP is not set
41984198
CONFIG_SPI_LJCA=m
4199-
# CONFIG_SPI_MICROCHIP_CORE is not set
42004199
# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
42014200
# CONFIG_SPI_LANTIQ_SSC is not set
42024201
# CONFIG_SPI_OC_TINY is not set

ciq/configs/kernel-x86_64.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86_64 6.18.2 Kernel Configuration
3+
# Linux/x86_64 6.18.3 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -4179,7 +4179,6 @@ CONFIG_SPI_CS42L43=m
41794179
# CONFIG_SPI_GPIO is not set
41804180
# CONFIG_SPI_LM70_LLP is not set
41814181
CONFIG_SPI_LJCA=m
4182-
# CONFIG_SPI_MICROCHIP_CORE is not set
41834182
# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set
41844183
# CONFIG_SPI_LANTIQ_SSC is not set
41854184
# CONFIG_SPI_OC_TINY is not set

0 commit comments

Comments
 (0)