Skip to contentSkip to conversation

hw/input: Add a CONFIG_PS2 switch for the ps2.c file

PATCH Applied Thomas Huth 3 participants 3 messages Apr 11, 2019 – Apr 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/input: Add a CONFIG_PS2 switch for the ps2.c file

ps2.c only needs to be compiled if we are building pckbd.c or pl050.c.

---
 hw/input/Kconfig       | 5 +++++
 hw/input/Makefile.objs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
hw/input/Kconfig +5 -0
index e2e66f0858..316573f782 100644
@@ -8,10 +8,15 @@ config LM832X
 config PCKBD
     bool
     default y
+    select PS2
     depends on ISA_BUS
 
 config PL050
     bool
+    select PS2
+
+config PS2
+    bool
 
 config STELLARIS_INPUT
     bool
hw/input/Makefile.objs +1 -1
index c8b00f71ec..6db5ee0e71 100644
@@ -3,7 +3,7 @@ common-obj-y += hid.o
 common-obj-$(CONFIG_LM832X) += lm832x.o
 common-obj-$(CONFIG_PCKBD) += pckbd.o
 common-obj-$(CONFIG_PL050) += pl050.o
-common-obj-y += ps2.o
+common-obj-$(CONFIG_PS2) += ps2.o
 common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
 
Signature · 1 line
2.21.0
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 1 line · Thomas Huth

ps2.c only needs to be compiled if we are building pckbd.c or pl050.c.

Hehe I have the same patch staged locally =)

Quoted 1 line
Quoted 39 lines
---
 hw/input/Kconfig       | 5 +++++
 hw/input/Makefile.objs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
hw/input/Kconfig +5 -0
index e2e66f0858..316573f782 100644
@@ -8,10 +8,15 @@ config LM832X
 config PCKBD
     bool
     default y
+    select PS2
     depends on ISA_BUS
 
 config PL050
     bool
+    select PS2
+
+config PS2
+    bool
 
 config STELLARIS_INPUT
     bool
hw/input/Makefile.objs +1 -1
index c8b00f71ec..6db5ee0e71 100644
@@ -3,7 +3,7 @@ common-obj-y += hid.o
 common-obj-$(CONFIG_LM832X) += lm832x.o
 common-obj-$(CONFIG_PCKBD) += pckbd.o
 common-obj-$(CONFIG_PL050) += pl050.o
-common-obj-y += ps2.o
+common-obj-$(CONFIG_PS2) += ps2.o
 common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
 
#2 lore raw
In reply to Thomas Huth
Quoted 34 lines · Thomas Huth

ps2.c only needs to be compiled if we are building pckbd.c or pl050.c.

---
 hw/input/Kconfig       | 5 +++++
 hw/input/Makefile.objs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
hw/input/Kconfig +5 -0
index e2e66f0858..316573f782 100644
@@ -8,10 +8,15 @@ config LM832X
 config PCKBD
     bool
     default y
+    select PS2
     depends on ISA_BUS
 
 config PL050
     bool
+    select PS2
+
+config PS2
+    bool
 
 config STELLARIS_INPUT
     bool
hw/input/Makefile.objs +0 -0
index c8b00f71ec..6db5ee0e71 100644

hw/input/Makefile.objs common-obj-y += hid.o · line 9

Quoted 8 lines
hw/input/Makefile.objs +1 -1
@@ -3,7 +3,7 @@ common-obj-y += hid.o
 common-obj-$(CONFIG_LM832X) += lm832x.o
 common-obj-$(CONFIG_PCKBD) += pckbd.o
 common-obj-$(CONFIG_PL050) += pl050.o
-common-obj-y += ps2.o
+common-obj-$(CONFIG_PS2) += ps2.o
 common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
 

Queued, thanks. (Also, nice find :)).

Paolo