From c2f4db3edb894355b5be364760c3e7a023b67b20 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Wed, 3 Jul 2019 13:39:43 -0700 Subject: Rename CONFIG_CHARGEN to CONFIG_CMD_CHARGEN The updated name is more is better aligned with EC codebase use of CONFIG_ variables. BRANCH=none BUG=none TEST=make buildall -j Change-Id: I52a35e33debb2cab41c009dbb8938614a810baef Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1688134 Reviewed-by: Namyoon Woo --- common/build.mk | 2 +- include/config.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/build.mk b/common/build.mk index d0231feaf6..425a5ba4fc 100644 --- a/common/build.mk +++ b/common/build.mk @@ -41,7 +41,7 @@ common-$(CONFIG_CROS_BOARD_INFO)+=cbi.o common-$(CONFIG_CHARGE_MANAGER)+=charge_manager.o common-$(CONFIG_CHARGE_RAMP_HW)+=charge_ramp.o common-$(CONFIG_CHARGE_RAMP_SW)+=charge_ramp.o charge_ramp_sw.o -common-$(CONFIG_CHARGEN) += chargen.o +common-$(CONFIG_CMD_CHARGEN) += chargen.o common-$(CONFIG_CHARGER)+=charger.o common-$(CONFIG_CHARGER_PROFILE_OVERRIDE_COMMON)+=charger_profile_override.o common-$(CONFIG_CHARGER_V2)+=charge_state_v2.o diff --git a/include/config.h b/include/config.h index 9765f83859..4f349a5050 100644 --- a/include/config.h +++ b/include/config.h @@ -677,9 +677,6 @@ /*****************************************************************************/ -/* Cli command for generating UART console traffic, used for testing. */ -#undef CONFIG_CHARGEN - /* Compile charge manager */ #undef CONFIG_CHARGE_MANAGER @@ -1142,6 +1139,7 @@ #undef CONFIG_CMD_BUTTON #define CONFIG_CMD_CBI #undef CONFIG_CMD_CCD_DISABLE /* 'ccd disable' subcommand */ +#undef CONFIG_CMD_CHARGEN #define CONFIG_CMD_CHARGER #undef CONFIG_CMD_CHARGER_ADC_AMON_BMON #undef CONFIG_CMD_CHARGER_DUMP -- cgit v1.2.1