Change in coreboot[master]: mainboard/google/rambi: Move SIO_EC_ENABLE_PS2K to onboard.h

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/18965 )

Change subject: mainboard/google/rambi: Move SIO_EC_ENABLE_PS2K to onboard.h
......................................................................

mainboard/google/rambi: Move SIO_EC_ENABLE_PS2K to onboard.h

Instead of defining SIO_EC_ENABLE_PS2K by default for all boards and
doing an undef in variant/onboard.h, move the definition of
SIO_EC_ENABLE_PS2K to variant/onboard.h. This avoids dependency
between different *.asl files.

Change-Id: I83e4ce42a594e952a443c618d7ef9840113027b9
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/18965
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi 
Reviewed-by: Aaron Durbin 
---
M src/mainboard/google/rambi/acpi/superio.asl
M src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h
M src/mainboard/google/rambi/variants/candy/include/variant/onboard.h
M src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h
M src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h
M src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h
M src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h
M src/mainboard/google/rambi/variants/heli/include/variant/onboard.h
M src/mainboard/google/rambi/variants/kip/include/variant/onboard.h
M src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h
M src/mainboard/google/rambi/variants/orco/include/variant/onboard.h
M src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h
M src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h
M src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h
M src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h
M src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h
M src/mainboard/google/rambi/variants/winky/include/variant/onboard.h
17 files changed, 28 insertions(+), 7 deletions(-)

Approvals:
  Aaron Durbin: Looks good to me, approved
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/rambi/acpi/superio.asl b/src/mainboard/google/rambi/acpi/superio.asl
index adc34aa..e3557d9 100644
--- a/src/mainboard/google/rambi/acpi/superio.asl
+++ b/src/mainboard/google/rambi/acpi/superio.asl
@@ -18,7 +18,6 @@

#define SIO_EC_MEMMAP_ENABLE     // EC Memory Map Resources
 #define SIO_EC_HOST_ENABLE       // EC Host Interface Resources
-#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard

/* Variant configuration */
 #include <variant/onboard.h>
diff --git a/src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h b/src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h
index 38410e1..617fe02 100644
--- a/src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h
@@ -30,4 +30,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/candy/include/variant/onboard.h b/src/mainboard/google/rambi/variants/candy/include/variant/onboard.h
index 9a69821..22372d7 100644
--- a/src/mainboard/google/rambi/variants/candy/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/candy/include/variant/onboard.h
@@ -36,4 +36,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h b/src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h
index 016f657..cd5052d 100644
--- a/src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h
@@ -36,4 +36,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h b/src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h
index 2a1045d..f146067 100644
--- a/src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h
@@ -31,4 +31,6 @@
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)
 #define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h b/src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h
index 121da36..3fbd77f 100644
--- a/src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h
@@ -36,4 +36,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h b/src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h
index 86ca488..c188ccf 100644
--- a/src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h
@@ -36,4 +36,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/heli/include/variant/onboard.h b/src/mainboard/google/rambi/variants/heli/include/variant/onboard.h
index f4ffed5..8134ab4 100644
--- a/src/mainboard/google/rambi/variants/heli/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/heli/include/variant/onboard.h
@@ -30,4 +30,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/kip/include/variant/onboard.h b/src/mainboard/google/rambi/variants/kip/include/variant/onboard.h
index 4bb37be..684aac8 100644
--- a/src/mainboard/google/rambi/variants/kip/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/kip/include/variant/onboard.h
@@ -31,4 +31,6 @@
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)
 #define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h b/src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h
index ec8bcd6..6a91314 100644
--- a/src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h
@@ -34,7 +34,4 @@

#define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

-/* Disable PS2 keyboard */
-#undef SIO_EC_ENABLE_PS2K
-
 #endif
diff --git a/src/mainboard/google/rambi/variants/orco/include/variant/onboard.h b/src/mainboard/google/rambi/variants/orco/include/variant/onboard.h
index b4a6c6e..ba316e9 100644
--- a/src/mainboard/google/rambi/variants/orco/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/orco/include/variant/onboard.h
@@ -30,4 +30,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h b/src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h
index 4bb37be..684aac8 100644
--- a/src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h
@@ -31,4 +31,6 @@
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)
 #define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h b/src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h
index b3332a3..a424f2f 100644
--- a/src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h
@@ -37,4 +37,6 @@
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)
 #define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h b/src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h
index 4bb37be..684aac8 100644
--- a/src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h
@@ -31,4 +31,6 @@
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)
 #define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h b/src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h
index 1fb268a..7003b9d 100644
--- a/src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h
@@ -41,7 +41,4 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

-/* Disable PS2 keyboard */
-#undef SIO_EC_ENABLE_PS2K
-
 #endif
diff --git a/src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h b/src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h
index f4ffed5..8134ab4 100644
--- a/src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h
@@ -30,4 +30,6 @@
 #define BOARD_I8042_IRQ                 GPIO_S0_DED_IRQ(I8042_IRQ_OFFSET)
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif
diff --git a/src/mainboard/google/rambi/variants/winky/include/variant/onboard.h b/src/mainboard/google/rambi/variants/winky/include/variant/onboard.h
index 9771179..065ec17 100644
--- a/src/mainboard/google/rambi/variants/winky/include/variant/onboard.h
+++ b/src/mainboard/google/rambi/variants/winky/include/variant/onboard.h
@@ -31,4 +31,6 @@
 #define BOARD_CODEC_IRQ                 GPIO_S5_DED_IRQ(CODEC_IRQ_OFFSET)
 #define BOARD_ALS_IRQ                   GPIO_S0_DED_IRQ(ALS_IRQ_OFFSET)

+#define SIO_EC_ENABLE_PS2K       // Enable PS/2 Keyboard
+
 #endif