From 3795b03b69129367d57c93033785d7877aabc2cc Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 23 Mar 2017 23:40:40 -0700 Subject: 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 --- src/mainboard/google/rambi/variants/banjo/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/candy/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/clapper/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/enguarde/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/glimmer/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/gnawty/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/heli/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/kip/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/ninja/include/variant/onboard.h | 3 --- src/mainboard/google/rambi/variants/orco/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/quawks/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/rambi/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/squawks/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/sumo/include/variant/onboard.h | 3 --- src/mainboard/google/rambi/variants/swanky/include/variant/onboard.h | 2 ++ src/mainboard/google/rambi/variants/winky/include/variant/onboard.h | 2 ++ 16 files changed, 28 insertions(+), 6 deletions(-) (limited to 'src/mainboard/google/rambi/variants') 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 -- cgit v1.2.3