summaryrefslogtreecommitdiff
path: root/baseboard
diff options
context:
space:
mode:
authorJeremy Bettis <jbettis@google.com>2022-11-22 12:49:27 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-11-23 20:12:17 +0000
commitc4b5de8ca4f5edeb1cc8ee820434c5ab3eb05ac8 (patch)
tree77c2c0ce3dfd11041960483f2406ac86e78a36de /baseboard
parent09da235c9cf169a22ab8711262a8cc7401271802 (diff)
downloadchrome-ec-c4b5de8ca4f5edeb1cc8ee820434c5ab3eb05ac8.tar.gz
baseboard: Move conditional includes to end
Move the zephyr only headers to be last, so the others will sort correctly with clang-format. BRANCH=None BUG=b:247100970 TEST=zmake build -a TEST=./twister --clobber -v -i TEST=make -j$(nproc) buildall_only runtests TEST=zmake compare-builds Signed-off-by: Jeremy Bettis <jbettis@google.com> Change-Id: I88211638be6ee1d3558a42e641d7c1882d7294cc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4049880 Reviewed-by: Aaron Massey <aaronmassey@google.com> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Tested-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'baseboard')
-rw-r--r--baseboard/volteer/usbc_config.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/baseboard/volteer/usbc_config.c b/baseboard/volteer/usbc_config.c
index 1d1181ee41..d77e275282 100644
--- a/baseboard/volteer/usbc_config.c
+++ b/baseboard/volteer/usbc_config.c
@@ -9,18 +9,19 @@
#include "charge_ramp.h"
#include "charge_state.h"
#include "common.h"
+#include "driver/charger/isl9241_public.h"
#include "gpio.h"
#include "task.h"
-#ifdef CONFIG_ZEPHYR
-#include "baseboard_usbc_config.h"
-#include "usbc_config.h"
-#endif
-#include "driver/charger/isl9241_public.h"
#include "usb_charge.h"
#include "usb_pd.h"
#include "usbc_ppc.h"
#include "util.h"
+#ifdef CONFIG_ZEPHYR
+#include "baseboard_usbc_config.h"
+#include "usbc_config.h"
+#endif
+
/******************************************************************************/
void tcpc_alert_event(enum gpio_signal signal)
{