[coreboot-gerrit] Patch set updated for coreboot: 201c486 mainboard/*/*/ec.c: Do not include `chromeos/chromeos.h`

Paul Menzel (paulepanter@users.sourceforge.net) gerrit at coreboot.org
Sun Mar 23 02:13:33 CET 2014


Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5398

-gerrit

commit 201c48658bf692298c549488f74550b4f7c426a1
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Sun Mar 23 00:09:32 2014 +0100

    mainboard/*/*/ec.c: Do not include `chromeos/chromeos.h`
    
    When not selecting the Kconfig option CHROMEOS, compilation of the board
    SAMSUNG Lumpy fails as the included header file uses `chromeos_acpi_t`,
    which is not known to the compiler when not building with support for
    Chrome OS.
    
    	In file included from src/mainboard/samsung/lumpy/ec.c:21:0:
    	src/vendorcode/google/chromeos/chromeos.h:65:43: error: unknown type name 'chromeos_acpi_t'
    
    Luckily, nothing from the header `chromeos.h` is used in `ec.c`, which
    was probably the case for the board the file was copied from, so do
    not include it at all.
    
    Looking further the header is included since commit
    
        6651da3b Add support for Intel Emerald Lake 2 CRB
    
    and is not needed there either and was copied over from then on. So
    remove it for all boards using the following command.
    
    	$ find src/mainboard/ -name 'ec.c' | xargs sed -i '/chromeos.h/d'
    
    Revert the change for Google Stout as `get_recovery_mode_switch()` is
    declared `chromeos/chromeos.h`.
    
    Change-Id: I7923717bfc5c84698044008e5f2441206041e0dd
    Reported-by: Idwer Vollering <vidwer at gmail.com>
    Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
 src/mainboard/google/bolt/ec.c        | 1 -
 src/mainboard/google/falco/ec.c       | 1 -
 src/mainboard/google/link/ec.c        | 1 -
 src/mainboard/google/parrot/ec.c      | 1 -
 src/mainboard/google/peppy/ec.c       | 1 -
 src/mainboard/google/rambi/ec.c       | 1 -
 src/mainboard/google/slippy/ec.c      | 1 -
 src/mainboard/google/stout/ec.c       | 1 -
 src/mainboard/intel/emeraldlake2/ec.c | 1 -
 src/mainboard/samsung/lumpy/ec.c      | 1 -
 10 files changed, 10 deletions(-)

diff --git a/src/mainboard/google/bolt/ec.c b/src/mainboard/google/bolt/ec.c
index 0919f0f..04a9931 100644
--- a/src/mainboard/google/bolt/ec.c
+++ b/src/mainboard/google/bolt/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/falco/ec.c b/src/mainboard/google/falco/ec.c
index 0919f0f..04a9931 100644
--- a/src/mainboard/google/falco/ec.c
+++ b/src/mainboard/google/falco/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/link/ec.c b/src/mainboard/google/link/ec.c
index 07da080..7dfadeb 100644
--- a/src/mainboard/google/link/ec.c
+++ b/src/mainboard/google/link/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/parrot/ec.c b/src/mainboard/google/parrot/ec.c
index e6d2d38..56f7d80 100644
--- a/src/mainboard/google/parrot/ec.c
+++ b/src/mainboard/google/parrot/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <device/device.h>
diff --git a/src/mainboard/google/peppy/ec.c b/src/mainboard/google/peppy/ec.c
index 0919f0f..04a9931 100644
--- a/src/mainboard/google/peppy/ec.c
+++ b/src/mainboard/google/peppy/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/rambi/ec.c b/src/mainboard/google/rambi/ec.c
index 0919f0f..04a9931 100644
--- a/src/mainboard/google/rambi/ec.c
+++ b/src/mainboard/google/rambi/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/slippy/ec.c b/src/mainboard/google/slippy/ec.c
index 0919f0f..04a9931 100644
--- a/src/mainboard/google/slippy/ec.c
+++ b/src/mainboard/google/slippy/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c
index 474d96f..91e139c 100644
--- a/src/mainboard/google/stout/ec.c
+++ b/src/mainboard/google/stout/ec.c
@@ -19,7 +19,6 @@
 
 #include <arch/acpi.h>
 #include <arch/io.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/quanta/it8518/ec.h>
diff --git a/src/mainboard/intel/emeraldlake2/ec.c b/src/mainboard/intel/emeraldlake2/ec.c
index ac37b0b..b50ab65 100644
--- a/src/mainboard/intel/emeraldlake2/ec.c
+++ b/src/mainboard/intel/emeraldlake2/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/smsc/mec1308/ec.h>
diff --git a/src/mainboard/samsung/lumpy/ec.c b/src/mainboard/samsung/lumpy/ec.c
index 40d8319..2406012 100644
--- a/src/mainboard/samsung/lumpy/ec.c
+++ b/src/mainboard/samsung/lumpy/ec.c
@@ -18,7 +18,6 @@
  */
 
 #include <arch/acpi.h>
-#include <vendorcode/google/chromeos/chromeos.h>
 #include <types.h>
 #include <console/console.h>
 #include <ec/smsc/mec1308/ec.h>



More information about the coreboot-gerrit mailing list