[coreboot-gerrit] Change in coreboot[master]: ec/google/chromeec: Remove keyboard initialization

Furquan Shaikh (Code Review) gerrit at coreboot.org
Fri Jun 29 20:53:35 CEST 2018


Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/27293


Change subject: ec/google/chromeec: Remove keyboard initialization
......................................................................

ec/google/chromeec: Remove keyboard initialization

Since none of the boards using chromeec select DRIVERS_PS2_KEYBOARD
now, there is no need to call pc_keyboard_init anymore. This change
gets rid of the call and adds an error message in case any mainboard
using chromeec tries to select this config.

BUG=b:110024487

Change-Id: Ia0b56abe0a5990e527277eaf3397e00dccda3e50
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
M src/ec/google/chromeec/ec_lpc.c
1 file changed, 10 insertions(+), 2 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/27293/1

diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 3078c22..b964e3a 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -18,7 +18,6 @@
 #include <console/console.h>
 #include <delay.h>
 #include <device/pnp.h>
-#include <pc80/keyboard.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -27,6 +26,16 @@
 #include "ec_commands.h"
 
 /*
+ * Chrome EC driver does not perform keyboard initialization. It relies on the
+ * payload to do this work. If a mainboard using Chrome EC requires
+ * CONFIG_DRIVERS_PS2_KEYBOARD then call to pc_keyboard_init needs to be added
+ * as well.
+ */
+#if IS_ENABLED(CONFIG_DRIVERS_PS2_KEYBOARD)
+#error "CONFIG_DRIVERS_PS2_KEYBOARD is not supported by Chrome EC"
+#endif
+
+/*
  * Read bytes from a given LPC-mapped address.
  *
  * @port: Base read address
@@ -430,7 +439,6 @@
 	if (!dev->enabled)
 		return;
 
-	pc_keyboard_init(NO_AUX_DEVICE);
 	google_chromeec_init();
 }
 

-- 
To view, visit https://review.coreboot.org/27293
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0b56abe0a5990e527277eaf3397e00dccda3e50
Gerrit-Change-Number: 27293
Gerrit-PatchSet: 1
Gerrit-Owner: Furquan Shaikh <furquan at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180629/5f3840a2/attachment.html>


More information about the coreboot-gerrit mailing list