From: pbrobinson on gitlab.com
None of the non x86 architectures support PS2, AT keyboards, i8042 controllers and related bits. This cleans up a bunch of those options as well as syncing some of the Fedora options on non x86 to be the same as ARK by moving the ARK bits to generic.
Signed-off-by: Peter Robinson pbrobinson@gmail.com
From: Peter Robinson pbrobinson@gmail.com
Disable the ancient DEC VSXXXAA mouse, needs a special adapter to be used over RS-232, only enable RS-232 mice on x86.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_SERIAL | 1 - redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_VSXXXAA | 1 - redhat/configs/common/generic/CONFIG_MOUSE_VSXXXAA | 2 +- redhat/configs/common/generic/{ => x86}/CONFIG_MOUSE_SERIAL | 0 4 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_SERIAL delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_VSXXXAA rename redhat/configs/common/generic/{ => x86}/CONFIG_MOUSE_SERIAL (100%)
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_SERIAL b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_SERIAL deleted file mode 100644 index 9e443d06f91c..000000000000 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_SERIAL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MOUSE_SERIAL is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_VSXXXAA b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_VSXXXAA deleted file mode 100644 index 8e411d15c47e..000000000000 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_VSXXXAA +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MOUSE_VSXXXAA is not set diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_VSXXXAA b/redhat/configs/common/generic/CONFIG_MOUSE_VSXXXAA index 1c962b695cd5..8e411d15c47e 100644 --- a/redhat/configs/common/generic/CONFIG_MOUSE_VSXXXAA +++ b/redhat/configs/common/generic/CONFIG_MOUSE_VSXXXAA @@ -1 +1 @@ -CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_VSXXXAA is not set diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_SERIAL b/redhat/configs/common/generic/x86/CONFIG_MOUSE_SERIAL similarity index 100% rename from redhat/configs/common/generic/CONFIG_MOUSE_SERIAL rename to redhat/configs/common/generic/x86/CONFIG_MOUSE_SERIAL
From: Peter Robinson pbrobinson@gmail.com
THe i8042 PC Keyboard controller and AT keyboard are x86 only so only enable them on that architecture.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/common/generic/CONFIG_KEYBOARD_ATKBD | 2 +- redhat/configs/common/generic/CONFIG_SERIO_I8042 | 2 +- redhat/configs/common/generic/x86/CONFIG_KEYBOARD_ATKBD | 1 + redhat/configs/common/generic/x86/CONFIG_SERIO_I8042 | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 redhat/configs/common/generic/x86/CONFIG_KEYBOARD_ATKBD create mode 100644 redhat/configs/common/generic/x86/CONFIG_SERIO_I8042
diff --git a/redhat/configs/common/generic/CONFIG_KEYBOARD_ATKBD b/redhat/configs/common/generic/CONFIG_KEYBOARD_ATKBD index 54a1bd12bfd8..99703e4ab082 100644 --- a/redhat/configs/common/generic/CONFIG_KEYBOARD_ATKBD +++ b/redhat/configs/common/generic/CONFIG_KEYBOARD_ATKBD @@ -1 +1 @@ -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set diff --git a/redhat/configs/common/generic/CONFIG_SERIO_I8042 b/redhat/configs/common/generic/CONFIG_SERIO_I8042 index 8e5a28dd35c8..845ecda41a38 100644 --- a/redhat/configs/common/generic/CONFIG_SERIO_I8042 +++ b/redhat/configs/common/generic/CONFIG_SERIO_I8042 @@ -1 +1 @@ -CONFIG_SERIO_I8042=y +# CONFIG_SERIO_I8042 is not set diff --git a/redhat/configs/common/generic/x86/CONFIG_KEYBOARD_ATKBD b/redhat/configs/common/generic/x86/CONFIG_KEYBOARD_ATKBD new file mode 100644 index 000000000000..54a1bd12bfd8 --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_KEYBOARD_ATKBD @@ -0,0 +1 @@ +CONFIG_KEYBOARD_ATKBD=y diff --git a/redhat/configs/common/generic/x86/CONFIG_SERIO_I8042 b/redhat/configs/common/generic/x86/CONFIG_SERIO_I8042 new file mode 100644 index 000000000000..8e5a28dd35c8 --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_SERIO_I8042 @@ -0,0 +1 @@ +CONFIG_SERIO_I8042=y
From: Peter Robinson pbrobinson@gmail.com
The LIBPS2 is only used by the PS2 mice and AT keyboard drivers which are now only enabled on x86
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/common/generic/CONFIG_SERIO_LIBPS2 | 2 +- redhat/configs/common/generic/x86/CONFIG_SERIO_LIBPS2 | 1 + redhat/configs/fedora/generic/s390x/CONFIG_SERIO_LIBPS2 | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 redhat/configs/common/generic/x86/CONFIG_SERIO_LIBPS2 delete mode 100644 redhat/configs/fedora/generic/s390x/CONFIG_SERIO_LIBPS2
diff --git a/redhat/configs/common/generic/CONFIG_SERIO_LIBPS2 b/redhat/configs/common/generic/CONFIG_SERIO_LIBPS2 index 0db209ef285e..163255434915 100644 --- a/redhat/configs/common/generic/CONFIG_SERIO_LIBPS2 +++ b/redhat/configs/common/generic/CONFIG_SERIO_LIBPS2 @@ -1 +1 @@ -CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_LIBPS2 is not set diff --git a/redhat/configs/common/generic/x86/CONFIG_SERIO_LIBPS2 b/redhat/configs/common/generic/x86/CONFIG_SERIO_LIBPS2 new file mode 100644 index 000000000000..0db209ef285e --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_SERIO_LIBPS2 @@ -0,0 +1 @@ +CONFIG_SERIO_LIBPS2=y diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_SERIO_LIBPS2 b/redhat/configs/fedora/generic/s390x/CONFIG_SERIO_LIBPS2 deleted file mode 100644 index b4e8482918bd..000000000000 --- a/redhat/configs/fedora/generic/s390x/CONFIG_SERIO_LIBPS2 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SERIO_LIBPS2=m
From: Peter Robinson pbrobinson@gmail.com
PS2 mice aren't supported on all current architectures other than x86 so move the generic option to x86 and the ark aarch64 options that disabled them to generic so it applies to all non x86 architectures.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2 | 1 - .../configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH | 1 - .../configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC | 1 - redhat/configs/common/generic/CONFIG_MOUSE_PS2 | 2 +- redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH | 2 +- redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC | 2 +- redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2 | 1 + redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH | 1 + redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC | 1 + .../x86/x86_64 => common/generic/x86}/CONFIG_MOUSE_PS2_VMMOUSE | 0 redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE | 1 - 11 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2 delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC create mode 100644 redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2 create mode 100644 redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH create mode 100644 redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_MOUSE_PS2_VMMOUSE (100%) delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2 b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2 deleted file mode 100644 index bd4390f41ebb..000000000000 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MOUSE_PS2 is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH deleted file mode 100644 index b84ff05dc82b..000000000000 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MOUSE_PS2_ELANTECH is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC deleted file mode 100644 index 1ecdbe98e5ef..000000000000 --- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MOUSE_PS2_SENTELIC is not set diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_PS2 b/redhat/configs/common/generic/CONFIG_MOUSE_PS2 index ed68613bee8b..bd4390f41ebb 100644 --- a/redhat/configs/common/generic/CONFIG_MOUSE_PS2 +++ b/redhat/configs/common/generic/CONFIG_MOUSE_PS2 @@ -1 +1 @@ -CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_PS2 is not set diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH index 15c77ec5c901..b84ff05dc82b 100644 --- a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH +++ b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH @@ -1 +1 @@ -CONFIG_MOUSE_PS2_ELANTECH=y +# CONFIG_MOUSE_PS2_ELANTECH is not set diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC index 14079ba62504..1ecdbe98e5ef 100644 --- a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC +++ b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC @@ -1 +1 @@ -CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_SENTELIC is not set diff --git a/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2 b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2 new file mode 100644 index 000000000000..ed68613bee8b --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2 @@ -0,0 +1 @@ +CONFIG_MOUSE_PS2=y diff --git a/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH new file mode 100644 index 000000000000..15c77ec5c901 --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH @@ -0,0 +1 @@ +CONFIG_MOUSE_PS2_ELANTECH=y diff --git a/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC new file mode 100644 index 000000000000..14079ba62504 --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC @@ -0,0 +1 @@ +CONFIG_MOUSE_PS2_SENTELIC=y diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_MOUSE_PS2_VMMOUSE b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE similarity index 100% rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_MOUSE_PS2_VMMOUSE rename to redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE b/redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE deleted file mode 100644 index d3f895d3b629..000000000000 --- a/redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MOUSE_PS2_VMMOUSE=y
From: Peter Robinson pbrobinson@gmail.com
The serio touchscreens in Fedora aren't used out side of x86 so move the ark configs to generic and the Fedora configs to fedora/x86. No change on ARK kernels.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_DYNAPRO | 0 .../{ark => common}/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL | 0 redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_FUJITSU | 0 redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_GUNZE | 0 redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_INEXIO | 0 redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_MTOUCH | 0 .../configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_PENMOUNT | 0 .../configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 | 0 .../configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT | 0 .../configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TOUCHWIN | 0 .../configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TSC_SERIO | 0 .../configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_DYNAPRO | 0 .../fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_EGALAX_SERIAL | 0 .../configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_FUJITSU | 0 redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_GUNZE | 0 redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_INEXIO | 0 redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_MTOUCH | 0 .../configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_PENMOUNT | 0 .../fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TOUCHIT213 | 0 .../fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TOUCHRIGHT | 0 .../configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TOUCHWIN | 0 .../configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TSC_SERIO | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_DYNAPRO (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_FUJITSU (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_GUNZE (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_INEXIO (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_MTOUCH (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_PENMOUNT (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TOUCHWIN (100%) rename redhat/configs/{ark => common}/generic/CONFIG_TOUCHSCREEN_TSC_SERIO (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_DYNAPRO (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_EGALAX_SERIAL (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_FUJITSU (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_GUNZE (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_INEXIO (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_MTOUCH (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_PENMOUNT (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TOUCHIT213 (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TOUCHRIGHT (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TOUCHWIN (100%) rename redhat/configs/fedora/generic/{ => x86}/CONFIG_TOUCHSCREEN_TSC_SERIO (100%)
diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_DYNAPRO b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_DYNAPRO similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_DYNAPRO rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_DYNAPRO diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_FUJITSU b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_FUJITSU similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_FUJITSU rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_FUJITSU diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_GUNZE b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_GUNZE similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_GUNZE rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_GUNZE diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_INEXIO b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_INEXIO similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_INEXIO rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_INEXIO diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_MTOUCH b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_MTOUCH similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_MTOUCH rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_MTOUCH diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_PENMOUNT b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_PENMOUNT similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_PENMOUNT rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_PENMOUNT diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TOUCHWIN b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TOUCHWIN similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TOUCHWIN rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TOUCHWIN diff --git a/redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TSC_SERIO b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TSC_SERIO similarity index 100% rename from redhat/configs/ark/generic/CONFIG_TOUCHSCREEN_TSC_SERIO rename to redhat/configs/common/generic/CONFIG_TOUCHSCREEN_TSC_SERIO diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_DYNAPRO b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_DYNAPRO similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_DYNAPRO rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_DYNAPRO diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_EGALAX_SERIAL similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_EGALAX_SERIAL rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_EGALAX_SERIAL diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_FUJITSU b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_FUJITSU similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_FUJITSU rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_FUJITSU diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_GUNZE b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_GUNZE similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_GUNZE rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_GUNZE diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_INEXIO b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_INEXIO similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_INEXIO rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_INEXIO diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_MTOUCH b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_MTOUCH similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_MTOUCH rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_MTOUCH diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_PENMOUNT b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_PENMOUNT similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_PENMOUNT rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_PENMOUNT diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TOUCHIT213 similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TOUCHIT213 rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TOUCHIT213 diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TOUCHRIGHT similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TOUCHRIGHT rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TOUCHRIGHT diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TOUCHWIN b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TOUCHWIN similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TOUCHWIN rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TOUCHWIN diff --git a/redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TSC_SERIO b/redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TSC_SERIO similarity index 100% rename from redhat/configs/fedora/generic/CONFIG_TOUCHSCREEN_TSC_SERIO rename to redhat/configs/fedora/generic/x86/CONFIG_TOUCHSCREEN_TSC_SERIO
From: Peter Robinson pbrobinson@gmail.com
In all kernels it's only used by some USB CEC drivers so it no longer needs to be built in.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/common/generic/CONFIG_SERIO_SERPORT | 2 +- redhat/configs/fedora/generic/s390x/CONFIG_SERIO_SERPORT | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 redhat/configs/fedora/generic/s390x/CONFIG_SERIO_SERPORT
diff --git a/redhat/configs/common/generic/CONFIG_SERIO_SERPORT b/redhat/configs/common/generic/CONFIG_SERIO_SERPORT index 341b61290d26..80a07531f86d 100644 --- a/redhat/configs/common/generic/CONFIG_SERIO_SERPORT +++ b/redhat/configs/common/generic/CONFIG_SERIO_SERPORT @@ -1 +1 @@ -CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_SERPORT=m diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_SERIO_SERPORT b/redhat/configs/fedora/generic/s390x/CONFIG_SERIO_SERPORT deleted file mode 100644 index 80a07531f86d..000000000000 --- a/redhat/configs/fedora/generic/s390x/CONFIG_SERIO_SERPORT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SERIO_SERPORT=m
From: Peter Robinson pbrobinson@gmail.com
The following EL0, Point of Sale and related, and Wacom touchscreens are serial based touch screens and are only really used on x86 systems.
Signed-off-by: Peter Robinson pbrobinson@gmail.com --- redhat/configs/common/generic/CONFIG_TOUCHSCREEN_ELO | 2 +- redhat/configs/common/generic/CONFIG_TOUCHSCREEN_WACOM_W8001 | 2 +- redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_ELO | 1 + .../configs/common/generic/x86/CONFIG_TOUCHSCREEN_WACOM_W8001 | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_ELO create mode 100644 redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_WACOM_W8001
diff --git a/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_ELO b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_ELO index 889c6b213f9b..043c220f03d7 100644 --- a/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_ELO +++ b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_ELO @@ -1 +1 @@ -CONFIG_TOUCHSCREEN_ELO=m +# CONFIG_TOUCHSCREEN_ELO is not set diff --git a/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_WACOM_W8001 b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_WACOM_W8001 index 27610e7df87a..7da59625a16f 100644 --- a/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_WACOM_W8001 +++ b/redhat/configs/common/generic/CONFIG_TOUCHSCREEN_WACOM_W8001 @@ -1 +1 @@ -CONFIG_TOUCHSCREEN_WACOM_W8001=m +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set diff --git a/redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_ELO b/redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_ELO new file mode 100644 index 000000000000..889c6b213f9b --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_ELO @@ -0,0 +1 @@ +CONFIG_TOUCHSCREEN_ELO=m diff --git a/redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_WACOM_W8001 b/redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_WACOM_W8001 new file mode 100644 index 000000000000..27610e7df87a --- /dev/null +++ b/redhat/configs/common/generic/x86/CONFIG_TOUCHSCREEN_WACOM_W8001 @@ -0,0 +1 @@ +CONFIG_TOUCHSCREEN_WACOM_W8001=m
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52451376...
@btissoir - can you review this?
From: Benjamin Tissoires on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52468425...
Hmm, I am actually really hesitant to give an ACK here. I wouldn't be surprised that s390x and/or powerpc might be using PS/2 for their mice/keyboards. I don't have any data to back this up unfortunately (no bug is showing up in my history).
The thing that worries me is that in the upstream code, there are a few `#if defined(CONFIG_X86)` here and there, which would lead me that X86 is not the only consumer of that bus.
After a search in the tree I find:
in `drivers/input/serio/Kconfig`: ``` config ARCH_MIGHT_HAVE_PC_SERIO bool help Select this config option from the architecture Kconfig if the architecture might use a PC serio device (i8042) to communicate with keyboard, mouse, etc. ```
And in `arch/powerpc/Kconfig` ``` select ARCH_MIGHT_HAVE_PC_SERIO ```
So definitively, powerpc has support for PS/2.
I'd say patches 3,5,6,7 are fine ("Generic: Mouse: Tweak generic serial mouse options", "Sync serio touchscreens for non x86 architectures to the same as ARK", "input: touchscreen: move ELO and Wacom serial touchscreens to x86", "Build SERIO_SERPORT as a module")
From: pbrobinson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52471925...
So s390/powerpc are not using PS2 anywhere. Some *old* PowerPC platforms had `PC_SERIO` in the POWER4 sort of age, but in Fedora/RHEL we only support POWER8 or later.
So *old* PowerPC did use PS/2 but none of the modern POWER8/POWER0 little endian platforms that we actually support do.
On Mon, 08 Mar 2021 22:57:11 -0000 "pbrobinson (via Email Bridge)" cki-gitlab@redhat.com wrote:
From: pbrobinson on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52471925...
So s390/powerpc are not using PS2 anywhere. Some *old* PowerPC platforms had `PC_SERIO` in the POWER4 sort of age, but in Fedora/RHEL we only support POWER8 or later.
So *old* PowerPC did use PS/2 but none of the modern POWER8/POWER0 little endian platforms that we actually support do.
that's correct, no need for legacy x86 options on s390x or ppc64le
Dan
From: Benjamin Tissoires on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52485310...
Thanks for the further digging.
In that case:
Acked-by: Benjamin Tissoires benjamin.tissoires@redhat.com
From: Benjamin Tissoires on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52487505...
Resending after tweaking my account settings:
From: Benjamin Tissoires on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52487622...
[sorry for the noise, I must had a 'enter' in the paste buffer]
Acked-by: Benjamin Tissoires benjamin.tissoires@redhat.com
From: Benjamin Tissoires on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52487793...
Grmbl...
Acked-by: <Benjamin Tissoires benjamin.tissoires@redhat.com>
From: Benjamin Tissoires on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/777#note_52488729...
OK, will this time CKI bot be happy (and sorry for the mess)
Acked-by: Benjamin Tissoires benjamin.tissoires@redhat.com
kernel@lists.fedoraproject.org