From 8d6ea6a491fb53460762a2f01c7e637a5c7cccc1 Mon Sep 17 00:00:00 2001 From: You-Cheng Syu Date: Wed, 13 Mar 2019 21:37:23 +0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31885 Reviewed-by: Hung-Te Lin Tested-by: build bot (Jenkins) --- src/include/types.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/include') 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 -- cgit v1.2.3