From d04f511b71ad2d8ef02d9602fd3eb683a910bd39 Mon Sep 17 00:00:00 2001
From: Randall Spangler <rspangler@chromium.org>
Date: Fri, 29 Jun 2012 10:02:08 -0700
Subject: Tidy util headers and make ec_commands.h not include other headers

In preparation for being able to copy ec_commands.h to u-boot, which
is itself in preparation for u-boot picking it up from /usr/src/ec/

BUG=none
TEST=make link, snow, bds

Change-Id: If256434b6722ff0787ce21a8ed4c7035c28024a8
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/26451
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
---
 include/ec_commands.h | 2 --
 util/burn_my_ec.c     | 3 ---
 util/comm-host.h      | 3 ++-
 util/comm-i2c.c       | 1 -
 util/comm-lpc.c       | 1 -
 util/ectool.c         | 3 ---
 util/lbplay.c         | 1 -
 7 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/include/ec_commands.h b/include/ec_commands.h
index b9380f86eb..907386434a 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -8,8 +8,6 @@
 #ifndef __CROS_EC_COMMANDS_H
 #define __CROS_EC_COMMANDS_H
 
-#include "common.h"
-
 /* Protocol overview
  *
  * request:  CMD [ P0 P1 P2 ... Pn S ]
diff --git a/util/burn_my_ec.c b/util/burn_my_ec.c
index f7b8273428..60fb82c4d7 100644
--- a/util/burn_my_ec.c
+++ b/util/burn_my_ec.c
@@ -10,10 +10,7 @@
 #include <sys/param.h>
 #include <unistd.h>
 
-#include "config.h"
 #include "comm-host.h"
-#include "ec_commands.h"
-#include "system.h"
 
 #define STR0(name)  #name
 #define STR(name)   STR0(name)
diff --git a/util/comm-host.h b/util/comm-host.h
index 969e71f4a6..b3790b4717 100644
--- a/util/comm-host.h
+++ b/util/comm-host.h
@@ -6,7 +6,8 @@
 #ifndef COMM_HOST_H
 #define COMM_HOST_H
 
-#include <stdint.h>
+#include "common.h"
+#include "ec_commands.h"
 
 /* Perform initializations needed for subsequent requests
  *
diff --git a/util/comm-i2c.c b/util/comm-i2c.c
index 7e968f035a..47241d392e 100644
--- a/util/comm-i2c.c
+++ b/util/comm-i2c.c
@@ -18,7 +18,6 @@
 #include <sys/types.h>
 
 #include "comm-host.h"
-#include "ec_commands.h"
 
 #define EC_I2C_ADDR 0x1e
 
diff --git a/util/comm-lpc.c b/util/comm-lpc.c
index 9e296ba866..31e2cdb3a2 100644
--- a/util/comm-lpc.c
+++ b/util/comm-lpc.c
@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 #include "comm-host.h"
-#include "ec_commands.h"
 
 #define INITIAL_UDELAY 5     /* 5 us */
 #define MAXIMUM_UDELAY 10000 /* 10 ms */
diff --git a/util/ectool.c b/util/ectool.c
index c0a9a20857..2cb80bedf1 100644
--- a/util/ectool.c
+++ b/util/ectool.c
@@ -12,11 +12,8 @@
 #include <unistd.h>
 
 #include "battery.h"
-#include "board.h"
 #include "comm-host.h"
-#include "ec_commands.h"
 #include "lightbar.h"
-#include "system.h"
 #include "vboot.h"
 
 /* Handy tricks */
diff --git a/util/lbplay.c b/util/lbplay.c
index 8b0c014cfe..1345a01b07 100644
--- a/util/lbplay.c
+++ b/util/lbplay.c
@@ -12,7 +12,6 @@
 
 #include "comm-host.h"
 #include "lightbar.h"
-#include "ec_commands.h"
 
 /* Handy tricks */
 #define BUILD_ASSERT(cond) ((void)sizeof(char[1 - 2*!(cond)]))
-- 
cgit v1.2.1