diff options
| author | You-Cheng Syu <youcheng@google.com> | 2019-03-13 21:37:23 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-08-23 20:22:04 +0000 |
| commit | 8d6ea6a491fb53460762a2f01c7e637a5c7cccc1 (patch) | |
| tree | 609a8a10847f9e8013d2530e24db6a7500cc7f51 /src/include | |
| parent | f6f4a8f8de9ab2a62d5fa24a25472c4ba7657f9c (diff) | |
ec/google/chromeec: Update ec_commands.h
Copy ec_commands.h directly from ChromiumOS EC repository (CL:1520574).
Since ec_commands.h already defines usb_charge_mode and only
USB_CHARGE_MODE_DISABLED is used in coreboot, enum usb_charge_mode is
removed from ec.h.
To avoid redefinition of the BIT macro, #ifndef check is added to
include/types.h.
BUG=b:109900671,b:118654976
BRANCH=none
TEST=emerge-kukui -j coreboot
Change-Id: I7ed5344fc8923e45e17c3e2a34371db6f80b079d
Signed-off-by: You-Cheng Syu <youcheng@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31885
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/types.h b/src/include/types.h index d6fdc08588..5902bc268a 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -25,7 +25,9 @@ * from the MSB (e.g. PowerPC), but until we cross that bridge, this macro is * perfectly fine. */ +#ifndef BIT #define BIT(x) (1ul << (x)) +#endif /** * coreboot error codes |