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>
This commit is contained in:
Furquan Shaikh 2017-03-23 23:40:40 -07:00 committed by Martin Roth
parent ba2531c8a2
commit 3795b03b69
17 changed files with 28 additions and 7 deletions

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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