summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-03-23 23:40:40 -0700
committerMartin Roth <martinroth@google.com>2017-03-27 02:59:22 +0200
commit3795b03b69129367d57c93033785d7877aabc2cc (patch)
treeee54868062683114b6d6b6cf9e9b9a23c59ffbd5 /src/mainboard/google
parentba2531c8a21c5e95cbed85b1a7bcccc795d3f52e (diff)
downloadcoreboot-3795b03b69129367d57c93033785d7877aabc2cc.tar.xz
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 <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/18965 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/rambi/acpi/superio.asl1
-rw-r--r--src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/candy/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/heli/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/kip/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h3
-rw-r--r--src/mainboard/google/rambi/variants/orco/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h3
-rw-r--r--src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h2
-rw-r--r--src/mainboard/google/rambi/variants/winky/include/variant/onboard.h2
17 files changed, 28 insertions, 7 deletions
diff --git a/src/mainboard/google/rambi/acpi/superio.asl b/src/mainboard/google/rambi/acpi/superio.asl
index adc34aa4cd..e3557d9316 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 38410e12f3..617fe021b9 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 9a6982123c..22372d7bf1 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 016f65747f..cd5052d5e0 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 2a1045d39b..f1460678f8 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 121da36f99..3fbd77f5d1 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 86ca488f3c..c188ccfe06 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 f4ffed5e61..8134ab412b 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 4bb37be51c..684aac81bb 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 ec8bcd6f89..6a91314830 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 @@ void lan_init(void);
#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 b4a6c6e4f5..ba316e9018 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 4bb37be51c..684aac81bb 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 b3332a3a4b..a424f2f23f 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 4bb37be51c..684aac81bb 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 1fb268aa9b..7003b9db0a 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 @@ void lan_init(void);
#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 f4ffed5e61..8134ab412b 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 9771179531..065ec17249 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