Clean up charger config options

These are now described in config.h. The various BQ chargers now also use a consistent naming for their sense resistor options. No functional changes, just renaming, and removal of obsolete never-defined configs. BUG=chrome-os-partner:18343 BRANCH=none TEST=build all platforms Change-Id: Ie274546fe45f5ffc6fd0f26096c4622805baf8a0 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/62540
2026-01-10 17:41:54 +00:00 · 2013-07-18 13:43:34 -07:00
parent 148a6f58d4
commit 345c22be08
13 changed files with 219 additions and 187 deletions
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -165,13 +165,8 @@ enum x86_signal {
 };

 /* Charger module */
-/* Set charger input current limit
- * Note - this value should depend on external power adapter,
- *        designed charging voltage, and the maximum power of
- *        a running system.
- */
-#define CONFIG_BQ24738_R_SNS 10 /* 10 mOhm charge sense resistor */
-#define CONFIG_BQ24738_R_AC  10 /* 10 mOhm input current sense resistor */
+#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* Charge sense resistor, mOhm */
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input sensor resistor, mOhm */
 #define CONFIG_CHARGER_INPUT_CURRENT 4032 /* mA, about half max */

 enum adc_channel {
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -65,21 +65,10 @@ enum adc_channel
 };

 /* Charger module */
-/* Set charger input current limit
- * Note - this value should depend on external power adapter,
- *        designed charging voltage, and the maximum power of
- *        a running system.
- *        Following value 4032 mA is the maximum input limit
- *        on Link's design.
- */
-#define CONFIG_CHARGER_INPUT_CURRENT 4032
-#define CONFIG_BQ24725_R_SNS 10 /* 10 mOhm charge sense resistor */
-#define CONFIG_BQ24725_R_AC  20 /* 20 mOhm input current sense resistor */
-
-/* Board specific charging current limit
- * The current constrant of all components on the charging path.
- */
-#define CONFIG_CHARGING_CURRENT_LIMIT 3000 /* PL102 inductor 3.0A(3.8A) */
+#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* Charge sense resistor, mOhm */
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 /* Input sensor resistor, mOhm */
+#define CONFIG_CHARGER_INPUT_CURRENT 4032 /* mA, based on Link HW design */
+#define CONFIG_CHARGER_CURRENT_LIMIT 3000 /* PL102 inductor 3.0A(3.8A) */

 /* I2C ports */
 #define I2C_PORT_BATTERY 0
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -165,16 +165,10 @@ enum x86_signal {
 };

 /* Charger module */
-/* Set charger input current limit
- * Note - this value should depend on external power adapter,
- *        designed charging voltage, and the maximum power of
- *        a running system.
- */
-#define CONFIG_BQ24707A_R_SNS 10 /* 10 mOhm charge sense resistor */
-#define CONFIG_BQ24707A_R_AC  10 /* 10 mOhm input current sense resistor */
+#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* Charge sense resistor, mOhm */
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input sensor resistor, mOhm */
 #define CONFIG_CHARGER_INPUT_CURRENT 3078 /* mA, 90% of power supply rating */

-
 enum adc_channel {
 	/* EC internal die temperature in degrees K. */
 	ADC_CH_EC_TEMP = 0,
--- a/board/slippy/board.h
+++ b/board/slippy/board.h
@@ -163,15 +163,8 @@ enum x86_signal {
 };

 /* Charger module */
-/* Set charger input current limit
- * Note - this value should depend on external power adapter,
- *        designed charging voltage, and the maximum power of
- *        a running system.
- *        Following value 4032 mA is the maximum input limit
- *        on Link's design.
- */
-#define CONFIG_BQ24707A_R_SNS 10 /* 10 mOhm charge sense resistor */
-#define CONFIG_BQ24707A_R_AC  10 /* 10 mOhm input current sense resistor */
+#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* Charge sense resistor, mOhm */
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input sensor resistor, mOhm */
 #define CONFIG_CHARGER_INPUT_CURRENT 4032 /* mA, about half max */


--- a/board/wolf/board.h
+++ b/board/wolf/board.h
@@ -153,13 +153,8 @@ enum x86_signal {
 };

 /* Charger module */
-/* Set charger input current limit
- * Note - this value should depend on external power adapter,
- *        designed charging voltage, and the maximum power of
- *        a running system.
- */
-#define CONFIG_BQ24707A_R_SNS 10 /* 10 mOhm charge sense resistor */
-#define CONFIG_BQ24707A_R_AC  10 /* 10 mOhm input current sense resistor */
+#define CONFIG_CHARGER_SENSE_RESISTOR 10 /* Charge sense resistor, mOhm */
+#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input sensor resistor, mOhm */
 #define CONFIG_CHARGER_INPUT_CURRENT 3078 /* mA, 90% of a 65W adapter at 19V */

 enum adc_channel {
--- a/chip/lm4/uart.c
+++ b/chip/lm4/uart.c
@@ -283,4 +283,4 @@ DECLARE_CONSOLE_COMMAND(comxtest, command_comxtest,
 			"Write test data to COMx uart",
 			NULL);

-#endif /* CONFIG_COMX_TEST */
+#endif /* CONFIG_CMD_COMX_TEST */
--- a/common/battery_link.c
+++ b/common/battery_link.c
@@ -120,10 +120,7 @@ void battery_vendor_params(struct batt_params *batt)

 	limit_value(desired_current, current_limit[temp_range][volt_range]);

-#ifndef CONFIG_SLOW_PRECHARGE
 	/* If battery wants current, give it at least the precharge current */
 	if (*desired_current > 0 && *desired_current < info.precharge_current)
 		*desired_current = info.precharge_current;
-#endif /* CONFIG_SLOW_PRECHARGE */
-
 }
--- a/common/charge_state.c
+++ b/common/charge_state.c
@@ -280,9 +280,9 @@ static int state_common(struct power_state_context *ctx)
 	/* Apply battery pack vendor charging method */
 	battery_vendor_params(batt);

-#ifdef CONFIG_CHARGING_CURRENT_LIMIT
-	if (batt->desired_current > CONFIG_CHARGING_CURRENT_LIMIT)
-		batt->desired_current = CONFIG_CHARGING_CURRENT_LIMIT;
+#ifdef CONFIG_CHARGER_CURRENT_LIMIT
+	if (batt->desired_current > CONFIG_CHARGER_CURRENT_LIMIT)
+		batt->desired_current = CONFIG_CHARGER_CURRENT_LIMIT;
 #endif
 	if (batt->desired_current > user_current_limit)
 		batt->desired_current = user_current_limit;
--- a/common/charger_bq24707a.c
+++ b/common/charger_bq24707a.c
@@ -16,8 +16,8 @@

 /* Sense resistor configurations and macros */
 #define DEFAULT_SENSE_RESISTOR 10
-#define R_SNS CONFIG_BQ24707A_R_SNS
-#define R_AC  CONFIG_BQ24707A_R_AC
+#define R_SNS CONFIG_CHARGER_SENSE_RESISTOR
+#define R_AC  CONFIG_CHARGER_SENSE_RESISTOR_AC
 #define REG_TO_CURRENT(REG, RS) ((REG) * DEFAULT_SENSE_RESISTOR / (RS))
 #define CURRENT_TO_REG(CUR, RS) ((CUR) * (RS) / DEFAULT_SENSE_RESISTOR)

--- a/common/charger_bq24715.c
+++ b/common/charger_bq24715.c
@@ -14,8 +14,8 @@

 /* Sense resistor configurations and macros */
 #define DEFAULT_SENSE_RESISTOR 10
-#define R_SNS CONFIG_BQ24715_R_SNS
-#define R_AC  CONFIG_BQ24715_R_AC
+#define R_SNS CONFIG_CHARGER_SENSE_RESISTOR
+#define R_AC  CONFIG_CHARGER_SENSE_RESISTOR_AC
 #define REG_TO_CURRENT(REG, RS) ((REG) * DEFAULT_SENSE_RESISTOR / (RS))
 #define CURRENT_TO_REG(CUR, RS) ((CUR) * (RS) / DEFAULT_SENSE_RESISTOR)

--- a/common/charger_bq24725.c
+++ b/common/charger_bq24725.c
@@ -15,8 +15,8 @@

 /* Sense resistor configurations and macros */
 #define DEFAULT_SENSE_RESISTOR 10
-#define R_SNS CONFIG_BQ24725_R_SNS
-#define R_AC  CONFIG_BQ24725_R_AC
+#define R_SNS CONFIG_CHARGER_SENSE_RESISTOR
+#define R_AC  CONFIG_CHARGER_SENSE_RESISTOR_AC
 #define REG_TO_CURRENT(REG, RS) ((REG) * DEFAULT_SENSE_RESISTOR / (RS))
 #define CURRENT_TO_REG(CUR, RS) ((CUR) * (RS) / DEFAULT_SENSE_RESISTOR)

--- a/common/charger_bq24738.c
+++ b/common/charger_bq24738.c
@@ -15,8 +15,8 @@

 /* Sense resistor configurations and macros */
 #define DEFAULT_SENSE_RESISTOR 10
-#define R_SNS CONFIG_BQ24738_R_SNS
-#define R_AC  CONFIG_BQ24738_R_AC
+#define R_SNS CONFIG_CHARGER_SENSE_RESISTOR
+#define R_AC  CONFIG_CHARGER_SENSE_RESISTOR_AC
 #define REG_TO_CURRENT(REG, RS) ((REG) * DEFAULT_SENSE_RESISTOR / (RS))
 #define CURRENT_TO_REG(CUR, RS) ((CUR) * (RS) / DEFAULT_SENSE_RESISTOR)

--- a/include/config.h
+++ b/include/config.h
@@ -19,135 +19,204 @@
 #define __CROS_EC_CONFIG_H

 /*
- * TODO(rspangler): set defaults and describe ALL config variables.
+ * All config options are listed alphabetically and described here.
 *
- * Here is the current list:
-
-CONFIG_ADC
-CONFIG_ASSERT_HELP
-CONFIG_BACKLIGHT_X86
-CONFIG_BATTERY_BQ20Z453
-CONFIG_BATTERY_FALCO
-CONFIG_BATTERY_LINK
-CONFIG_BATTERY_PEPPY
-CONFIG_BATTERY_SLIPPY
-CONFIG_BATTERY_SPRING
-CONFIG_BOARD_POST_GPIO_INIT
-CONFIG_BOARD_PRE_INIT
-CONFIG_BOARD_VERSION
-CONFIG_BQ24707A_R_AC
-CONFIG_BQ24707A_R_SNS
-CONFIG_BQ24725_R_AC
-CONFIG_BQ24725_R_SNS
-CONFIG_BQ24738_R_AC
-CONFIG_BQ24738_R_SNS
-CONFIG_CHARGER
-CONFIG_CHARGER_BQ24707A
-CONFIG_CHARGER_BQ24725
-CONFIG_CHARGER_BQ24738
-CONFIG_CHARGER_INPUT_CURRENT
-CONFIG_CHARGER_TPS65090
-CONFIG_CHARGING_CURRENT_LIMIT
-CONFIG_CHIPSET_GAIA
-CONFIG_CHIPSET_HASWELL
-CONFIG_CHIPSET_IVYBRIDGE
-CONFIG_CMD_PMU
-CONFIG_CONSOLE_CMDHELP
-CONFIG_CONSOLE_RESTRICTED_INPUT
-CONFIG_CONSOLE_UART
-CONFIG_CUSTOM_KEYSCAN
-CONFIG_DEBUG
-CONFIG_DEBUG_I2C
-CONFIG_EEPROM
-CONFIG_EOPTION
-CONFIG_EXTPOWER_FALCO
-CONFIG_EXTPOWER_GPIO
-CONFIG_EXTPOWER_SNOW
-CONFIG_EXTPOWER_USB
-CONFIG_FLASH
-CONFIG_FLASH_BANK_SIZE
-CONFIG_FLASH_BASE
-CONFIG_FLASH_ERASED_VALUE32
-CONFIG_FLASH_ERASE_SIZE
-CONFIG_FLASH_PHYSICAL_SIZE
-CONFIG_FLASH_PROTECT_NEXT_BOOT
-CONFIG_FLASH_SIZE
-CONFIG_FLASH_WRITE_SIZE
-CONFIG_FMAP
-CONFIG_FORCE_CONSOLE_RESUME
-CONFIG_FPU
-CONFIG_FW_IMAGE_SIZE
-CONFIG_FW_PSTATE_OFF
-CONFIG_FW_PSTATE_SIZE
-CONFIG_FW_RO_OFF
-CONFIG_FW_RO_SIZE
-CONFIG_FW_RW_OFF
-CONFIG_FW_RW_SIZE
-CONFIG_FW_WP_RO_OFF
-CONFIG_FW_WP_RO_SIZE
-CONFIG_HOSTCMD
-CONFIG_HOST_COMMAND_STATUS
-CONFIG_HOST_EMU
-CONFIG_HOST_UART
-CONFIG_HOST_UART1_GPIOS_PB0_1
-CONFIG_HOST_UART1_GPIOS_PC4_5
-CONFIG_HOST_UART2_GPIOS_PG4_5
-CONFIG_HOST_UART_IRQ
-CONFIG_I2C
-CONFIG_I2C_ARBITRATION
-CONFIG_I2C_HOST_AUTO
-CONFIG_I2C_PASSTHROUGH
-CONFIG_I2C_PASSTHRU_RESTRICTED
-CONFIG_IRQ_COUNT
-CONFIG_KEYBOARD_PROTOCOL_8042
-CONFIG_KEYBOARD_PROTOCOL_MKBP
-CONFIG_KEYBOARD_SUPPRESS_NOISE
-CONFIG_LED_DRIVER_LP5562
-CONFIG_LED_FALCO
-CONFIG_LED_PEPPY
-CONFIG_LED_SLIPPY
-CONFIG_LID_SWITCH
-CONFIG_LOW_POWER_IDLE
-CONFIG_LPC
-CONFIG_ONEWIRE
-CONFIG_ONEWIRE_LED
-CONFIG_PANIC_HELP
-CONFIG_PECI
-CONFIG_PMU_BOARD_INIT
-CONFIG_PMU_FORCE_FET
-CONFIG_PMU_HARD_RESET
-CONFIG_PMU_TPS65090
-CONFIG_POWER_BUTTON
-CONFIG_PSTORE
-CONFIG_PWM_FAN
-CONFIG_PWM_KBLIGHT
-CONFIG_RAM_BASE
-CONFIG_RAM_SIZE
-CONFIG_SMART_BATTERY
-CONFIG_SPI
-CONFIG_STACK_SIZE
-CONFIG_SYSTEM_UNLOCKED
-CONFIG_TASK_LIST
-CONFIG_TASK_PROFILING
-CONFIG_TEMP_SENSOR
-CONFIG_TEMP_SENSOR_G781
-CONFIG_TEMP_SENSOR_TMP006
-CONFIG_TEST_TASK_LIST
-CONFIG_UART_BAUD_RATE
-CONFIG_UART_RX_BUF_SIZE
-CONFIG_UART_TX_BUF_SIZE
-CONFIG_USB_PORT_POWER_DUMB
-CONFIG_USB_PORT_POWER_SMART
-CONFIG_USB_SWITCH_TSU6721
-CONFIG_WATCHDOG
-CONFIG_WATCHDOG_HELP
-CONFIG_WIRELESS
-CONFIG_WP_ACTIVE_HIGH
-
- * Also describe the HAS_TASK_* macro and how/when it should be used vs. a
- * config define.
+ * If you add a new config option somewhere in the code, you must add a
+ * default value here and describe what it does.
+ *
+ * To get a list current list, run this command:
+ *    git grep " CONFIG_" | grep -o "CONFIG_[A-Za-z0-9_]\+" | sort | uniq
+ *
+ * TODO(rspangler): describe all of these.  Also describe the HAS_TASK_* macro
+ * and how/when it should be used vs. a config define.
 */

+#undef CONFIG_AC_POWER_STATUS
+#undef CONFIG_ADC
+#undef CONFIG_ASSERT_HELP
+#undef CONFIG_BACKLIGHT_X86
+
+#undef CONFIG_BATTERY_BQ20Z453
+#undef CONFIG_BATTERY_FALCO
+#undef CONFIG_BATTERY_LINK
+#undef CONFIG_BATTERY_PEPPY
+#undef CONFIG_BATTERY_SLIPPY
+#undef CONFIG_BATTERY_SPRING
+
+#undef CONFIG_BOARD_PMU_INIT
+#undef CONFIG_BOARD_POST_GPIO_INIT
+#undef CONFIG_BOARD_PRE_INIT
+#undef CONFIG_BOARD_VERSION
+
+/*****************************************************************************/
+/* Charger config */
+
+/* Compile common charge state code */
+#undef CONFIG_CHARGER
+
+/* Compile charger-specific code for these chargers (pick at most one) */
+#undef CONFIG_CHARGER_BQ24707A
+#undef CONFIG_CHARGER_BQ24715
+#undef CONFIG_CHARGER_BQ24725
+#undef CONFIG_CHARGER_BQ24738
+#undef CONFIG_CHARGER_TPS65090
+
+/*
+ * Board specific charging current limit, in mA.  If defined, the charge state
+ * machine will not allow the battery to request more current than this.
+ */
+#undef CONFIG_CHARGER_CURRENT_LIMIT
+
+/*
+ * Maximum amount of input current the charger can receive, in mA.
+ *
+ * This value should depend on external power adapter, designed charging
+ * voltage, and the maximum power of the running system.
+ */
+#undef CONFIG_CHARGER_INPUT_CURRENT
+
+/* Value of the charge sense resistor, in mOhms */
+#undef CONFIG_CHARGER_SENSE_RESISTOR
+
+/* Value of the input current sense resistor, in mOhms */
+#undef CONFIG_CHARGER_SENSE_RESISTOR_AC
+
+/*****************************************************************************/
+
+#undef CONFIG_CHIPSET_GAIA
+#undef CONFIG_CHIPSET_HASWELL
+#undef CONFIG_CHIPSET_IVYBRIDGE
+
+#undef CONFIG_CMD_COMXTEST
+#undef CONFIG_CMD_ECTEMP
+#undef CONFIG_CMD_PLL
+#undef CONFIG_CMD_PMU
+#undef CONFIG_CMD_POWERLED
+#undef CONFIG_CMD_SCRATCHPAD
+#undef CONFIG_CMD_SLEEP
+
+#undef CONFIG_CONSOLE_CMDHELP
+#undef CONFIG_CONSOLE_RESTRICTED_INPUT
+#undef CONFIG_CONSOLE_UART
+
+#undef CONFIG_CUSTOM_KEYSCAN
+#undef CONFIG_DEBUG
+#undef CONFIG_DEBUG_I2C
+#undef CONFIG_DMA_HELP
+#undef CONFIG_EEPROM
+#undef CONFIG_EOPTION
+
+#undef CONFIG_EXTPOWER_FALCO
+#undef CONFIG_EXTPOWER_GPIO
+#undef CONFIG_EXTPOWER_SNOW
+#undef CONFIG_EXTPOWER_USB
+
+#undef CONFIG_FLASH
+#undef CONFIG_FLASH_BANK_SIZE
+#undef CONFIG_FLASH_BASE
+#undef CONFIG_FLASH_ERASED_VALUE32
+#undef CONFIG_FLASH_ERASE_SIZE
+#undef CONFIG_FLASH_PHYSICAL_SIZE
+#undef CONFIG_FLASH_PROTECT_NEXT_BOOT
+#undef CONFIG_FLASH_SIZE
+#undef CONFIG_FLASH_WRITE_IDEAL_SIZE
+#undef CONFIG_FLASH_WRITE_SIZE
+
+#undef CONFIG_FMAP
+#undef CONFIG_FORCE_CONSOLE_RESUME
+#undef CONFIG_FPU
+
+#undef CONFIG_FW_IMAGE_SIZE
+#undef CONFIG_FW_PSTATE_OFF
+#undef CONFIG_FW_PSTATE_SIZE
+#undef CONFIG_FW_RO_OFF
+#undef CONFIG_FW_RO_SIZE
+#undef CONFIG_FW_RW_OFF
+#undef CONFIG_FW_RW_SIZE
+#undef CONFIG_FW_WP_RO_OFF
+#undef CONFIG_FW_WP_RO_SIZE
+
+#undef CONFIG_HOSTCMD
+#undef CONFIG_HOST_COMMAND_STATUS
+#undef CONFIG_HOST_EMU
+#undef CONFIG_HOST_UART
+#undef CONFIG_HOST_UART1_GPIOS_PB0_1
+#undef CONFIG_HOST_UART1_GPIOS_PC4_5
+#undef CONFIG_HOST_UART2_GPIOS_PG4_5
+#undef CONFIG_HOST_UART_IRQ
+
+#undef CONFIG_I2C
+#undef CONFIG_I2C_ARBITRATION
+#undef CONFIG_I2C_DEBUG_PASSTHRU
+#undef CONFIG_I2C_HOST_AUTO
+#undef CONFIG_I2C_PASSTHROUGH
+#undef CONFIG_I2C_PASSTHRU_RESTRICTED
+
+#undef CONFIG_IRQ_COUNT
+
+#undef CONFIG_KEYBOARD_DEBUG_MORE
+#undef CONFIG_KEYBOARD_PROTOCOL_8042
+#undef CONFIG_KEYBOARD_PROTOCOL_MKBP
+#undef CONFIG_KEYBOARD_SUPPRESS_NOISE
+#undef CONFIG_KEYBOARD_TEST
+
+#undef CONFIG_LED_DRIVER_LP5562
+#undef CONFIG_LED_FALCO
+#undef CONFIG_LED_PEPPY
+
+#undef CONFIG_LID_SWITCH
+#undef CONFIG_LOW_POWER_IDLE
+#undef CONFIG_LPC
+#undef CONFIG_ONEWIRE
+#undef CONFIG_ONEWIRE_LED
+#undef CONFIG_OVERFLOW_DETECT
+#undef CONFIG_PANIC_HELP
+#undef CONFIG_PECI
+
+#undef CONFIG_PMU_BOARD_INIT
+#undef CONFIG_PMU_FORCE_FET
+#undef CONFIG_PMU_HARD_RESET
+#undef CONFIG_PMU_TPS65090
+
+#undef CONFIG_POWER_BUTTON
+#undef CONFIG_POWER_BUTTON_X86
+#undef CONFIG_PSTATE_AT_END
+#undef CONFIG_PSTORE
+#undef CONFIG_PWM_FAN
+#undef CONFIG_PWM_KBLIGHT
+#undef CONFIG_RAM_BASE
+#undef CONFIG_RAM_SIZE
+#undef CONFIG_SAVE_VBOOT_HASH
+#undef CONFIG_SMART_BATTERY
+#undef CONFIG_SOMETHING
+#undef CONFIG_SPI
+#undef CONFIG_STACK_SIZE
+#undef CONFIG_SWITCH
+#undef CONFIG_SYSTEM_UNLOCKED
+#undef CONFIG_TASK_LIST
+#undef CONFIG_TASK_PROFILING
+
+#undef CONFIG_TEMP_SENSOR
+#undef CONFIG_TEMP_SENSOR_G781
+#undef CONFIG_TEMP_SENSOR_TMP006
+
+#undef CONFIG_TEST_TASK_LIST
+
+#undef CONFIG_UART_BAUD_RATE
+#undef CONFIG_UART_RX_BUF_SIZE
+#undef CONFIG_UART_TX_BUF_SIZE
+
+#undef CONFIG_USB_PORT_POWER_DUMB
+#undef CONFIG_USB_PORT_POWER_SMART
+#undef CONFIG_USB_SWITCH_TSU6721
+
+#undef CONFIG_USE_CPCIDVI
+#undef CONFIG_USE_PLL
+#undef CONFIG_WATCHDOG
+#undef CONFIG_WATCHDOG_HELP
+#undef CONFIG_WIRELESS
+#undef CONFIG_WP_ACTIVE_HIGH
+
 /*
 * Include board and core configs, since those hold the CONFIG_ constants for a
 * given configuration.  This guarantees they get included everywhere, and