Skip to content

Commit 513904d

Browse files
committed
[CIQ] v6.12.23 - rebased configs
HAVE_EISA is only allowed for 32-bit x86/platform: Only allow CONFIG_EISA for 32-bit Upstream: commit 3e14d9a LD_CAN_USE_KEEP_IN_OVERLAY is now enabled if LD_IS_BFD=y ARM: 9443/1: Require linker to support KEEP within OVERLAY for DCE Upstream: 59fc423
1 parent 7e2147a commit 513904d

6 files changed

+12
-10
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.19 Kernel Configuration
3+
# Linux/arm64 6.12.23 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24+
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
2425
CONFIG_PAHOLE_VERSION=127
2526
CONFIG_CONSTRUCTORS=y
2627
CONFIG_IRQ_WORK=y

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.19 Kernel Configuration
3+
# Linux/arm64 6.12.23 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24+
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
2425
CONFIG_PAHOLE_VERSION=127
2526
CONFIG_IRQ_WORK=y
2627
CONFIG_BUILDTIME_TABLE_SORT=y

ciq/configs/kernel-aarch64-debug.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.19 Kernel Configuration
3+
# Linux/arm64 6.12.23 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24+
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
2425
CONFIG_PAHOLE_VERSION=127
2526
CONFIG_CONSTRUCTORS=y
2627
CONFIG_IRQ_WORK=y

ciq/configs/kernel-aarch64.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.19 Kernel Configuration
3+
# Linux/arm64 6.12.23 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24+
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
2425
CONFIG_PAHOLE_VERSION=127
2526
CONFIG_IRQ_WORK=y
2627
CONFIG_BUILDTIME_TABLE_SORT=y

ciq/configs/kernel-x86_64-debug.config

+2-3
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.12.19 Kernel Configuration
3+
# Linux/x86_64 6.12.23 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24+
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
2425
CONFIG_PAHOLE_VERSION=127
2526
CONFIG_CONSTRUCTORS=y
2627
CONFIG_IRQ_WORK=y
@@ -2047,8 +2048,6 @@ CONFIG_NET_TEST=m
20472048
#
20482049
# Device Drivers
20492050
#
2050-
CONFIG_HAVE_EISA=y
2051-
# CONFIG_EISA is not set
20522051
CONFIG_HAVE_PCI=y
20532052
CONFIG_GENERIC_PCI_IOMAP=y
20542053
CONFIG_PCI=y

ciq/configs/kernel-x86_64.config

+2-3
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.12.19 Kernel Configuration
3+
# Linux/x86_64 6.12.23 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
66
CONFIG_CC_IS_GCC=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
2121
CONFIG_CC_HAS_ASM_INLINE=y
2222
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
2323
CONFIG_CC_HAS_COUNTED_BY=y
24+
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
2425
CONFIG_PAHOLE_VERSION=127
2526
CONFIG_IRQ_WORK=y
2627
CONFIG_BUILDTIME_TABLE_SORT=y
@@ -2043,8 +2044,6 @@ CONFIG_NET_TEST=m
20432044
#
20442045
# Device Drivers
20452046
#
2046-
CONFIG_HAVE_EISA=y
2047-
# CONFIG_EISA is not set
20482047
CONFIG_HAVE_PCI=y
20492048
CONFIG_GENERIC_PCI_IOMAP=y
20502049
CONFIG_PCI=y

0 commit comments

Comments
 (0)