diff options
-rw-r--r-- | board/host/board.h | 4 | ||||
-rw-r--r-- | chip/host/config_chip.h | 3 | ||||
-rw-r--r-- | chip/lm4/config_chip.h | 2 | ||||
-rw-r--r-- | chip/stm32/clock-stm32l.c | 21 | ||||
-rw-r--r-- | chip/stm32/config_chip.h | 4 | ||||
-rw-r--r-- | common/build.mk | 2 | ||||
-rw-r--r-- | common/keyboard_8042.c | 6 | ||||
-rw-r--r-- | include/config.h | 46 |
8 files changed, 44 insertions, 44 deletions
diff --git a/board/host/board.h b/board/host/board.h index 64cda75f01..ad553b0c02 100644 --- a/board/host/board.h +++ b/board/host/board.h @@ -10,15 +10,15 @@ /* Optional features */ #define CONFIG_EXTPOWER_GPIO -#define CONFIG_HOST_EMU +#undef CONFIG_FMAP #define CONFIG_POWER_BUTTON #define CONFIG_TEMP_SENSOR #undef CONFIG_WATCHDOG /* Host test config */ #ifdef SMART_BATTERY_CHARGER +#define CONFIG_BATTERY_MOCK #define CONFIG_CHARGER -#define CONFIG_MOCK_BATTERY #define CONFIG_CHARGER_INPUT_CURRENT 4032 #endif diff --git a/chip/host/config_chip.h b/chip/host/config_chip.h index 1cbf7710d4..0c9a350617 100644 --- a/chip/host/config_chip.h +++ b/chip/host/config_chip.h @@ -31,9 +31,6 @@ extern char __host_flash[CONFIG_FLASH_PHYSICAL_SIZE]; #define CONFIG_FW_WP_RO_OFF CONFIG_FW_RO_OFF #define CONFIG_FW_WP_RO_SIZE CONFIG_FW_IMAGE_SIZE -/* Features */ -#define CONFIG_FLASH - /* * Put this after RO to give RW more space and make RO write protect region * contiguous. diff --git a/chip/lm4/config_chip.h b/chip/lm4/config_chip.h index 1b44abb770..004d98b09a 100644 --- a/chip/lm4/config_chip.h +++ b/chip/lm4/config_chip.h @@ -101,8 +101,6 @@ /* Optional features present on this chip */ #define CONFIG_ADC -#define CONFIG_FLASH -#define CONFIG_FMAP #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_LPC diff --git a/chip/stm32/clock-stm32l.c b/chip/stm32/clock-stm32l.c index 79b618363f..4d5b1babeb 100644 --- a/chip/stm32/clock-stm32l.c +++ b/chip/stm32/clock-stm32l.c @@ -90,28 +90,9 @@ static void clock_set_osc(enum clock_osc osc) /* Flash 1 wait state */ tmp_acr |= STM32_FLASH_ACR_LATENCY; STM32_FLASH_ACR = tmp_acr; - -#ifdef CONFIG_USE_PLL - /* - * Switch to HSI, no prescaler, PLLSRC = HSI, PLLMUL = x3, - * PLLDIV = /3, no MCO => PLLVCO = 48 MHz and PLLCLK = 16 Mhz. - */ - STM32_RCC_CFGR = 0x00800001; - - /* Enable the PLL */ - STM32_RCC_CR |= 1 << 24; - /* Wait for the PLL to lock */ - while (!(STM32_RCC_CR & (1 << 25))) - ; - /* Switch to SYSCLK to the PLL */ - STM32_RCC_CFGR = 0x00800003; - /* Wait until the PLL is the clock source */ - while ((STM32_RCC_CFGR & 0xc) != 0xc) - ; -#else /* Switch to HSI */ STM32_RCC_CFGR = STM32_RCC_CFGR_SW_HSI; -#endif + freq = HSI_CLOCK; break; diff --git a/chip/stm32/config_chip.h b/chip/stm32/config_chip.h index a06d590e31..40de499fd5 100644 --- a/chip/stm32/config_chip.h +++ b/chip/stm32/config_chip.h @@ -40,10 +40,6 @@ /* Number of I2C ports */ #define I2C_PORT_COUNT 2 -/* Support programming on-chip flash */ -#define CONFIG_FLASH -#define CONFIG_FMAP - /* * Use a timer to print a watchdog warning event before the actual watchdog * timer fires. This is needed on STM32, where the independent watchdog has no diff --git a/common/build.mk b/common/build.mk index 63935e8a63..a8846541e4 100644 --- a/common/build.mk +++ b/common/build.mk @@ -21,6 +21,7 @@ common-$(BOARD_spring)+=battery_spring.o common-$(CONFIG_BACKLIGHT_X86)+=backlight_x86.o common-$(CONFIG_BATTERY_BQ20Z453)+=battery_bq20z453.o +common-$(CONFIG_BATTERY_MOCK)+=mock_smart_battery_stub.o mock_charger.o common-$(CONFIG_BATTERY_SMART)+=smart_battery.o smart_battery_stub.o common-$(CONFIG_CHARGER)+=charge_state.o charger_common.o common-$(CONFIG_CHARGER_BQ24715)+=charger_bq24715.o @@ -46,7 +47,6 @@ common-$(CONFIG_KEYBOARD_TEST)+=keyboard_test.o common-$(CONFIG_LED_DRIVER_LP5562)+=led_driver_lp5562.o led_lp5562.o common-$(CONFIG_LID_SWITCH)+=lid_switch.o common-$(CONFIG_LPC)+=port80.o -common-$(CONFIG_MOCK_BATTERY)+=mock_smart_battery_stub.o mock_charger.o common-$(CONFIG_ONEWIRE_LED)+=onewire_led.o common-$(CONFIG_POWER_BUTTON)+=power_button.o common-$(CONFIG_POWER_BUTTON_X86)+=power_button_x86.o diff --git a/common/keyboard_8042.c b/common/keyboard_8042.c index 5cccc1dd82..67073b23ef 100644 --- a/common/keyboard_8042.c +++ b/common/keyboard_8042.c @@ -654,11 +654,7 @@ static int handle_keyboard_data(uint8_t data, uint8_t *output) case 0x60: /* fall-thru */ case 0x45: - /* - * U-boot hack. See CONFIG_USE_CPCIDVI in - * third_party/u-boot/files/drivers/input/i8042.c. - * Just ignore; don't reply. - */ + /* U-boot hack. Just ignore; don't reply. */ break; case I8042_CMD_SETALL_MB: /* fall-thru */ diff --git a/include/config.h b/include/config.h index ac52fa60be..7484ee5852 100644 --- a/include/config.h +++ b/include/config.h @@ -32,10 +32,18 @@ * respectively. * * TODO(rspangler): describe all of these. Also describe the HAS_TASK_* macro - * and how/when it should be used vs. a config define. + * and how/when it should be used vs. a config define. And BOARD_*, CHIP_*, + * and CHIP_FAMILY_*. */ +/* Compile chip support for analog-to-digital convertor */ #undef CONFIG_ADC + +/* + * Compile support for passing backlight-enable signal from x86 chipset through + * EC. This allows the EC to gate the backlight-enable signal with the lid + * switch. + */ #undef CONFIG_BACKLIGHT_X86 /*****************************************************************************/ @@ -43,6 +51,7 @@ /* Compile battery-specific code for these batteries (pick at most one) */ #undef CONFIG_BATTERY_BQ20Z453 +#undef CONFIG_BATTERY_MOCK /* * Battery can check if it's connected. If defined, charger will check for @@ -60,8 +69,19 @@ /*****************************************************************************/ +/* + * Call board_config_post_gpio_init() after GPIOs are initialized. See + * include/board_config.h for more information. + */ #undef CONFIG_BOARD_POST_GPIO_INIT + +/* + * Call board_config_pre_init() before any inits are called. See + * include/board_config.h for more information. + */ #undef CONFIG_BOARD_PRE_INIT + +/* EC has GPIOs attached to board version stuffing resistors */ #undef CONFIG_BOARD_VERSION /*****************************************************************************/ @@ -132,6 +152,11 @@ /* Max length of a single line of input */ #define CONFIG_CONSOLE_INPUT_LINE_SIZE 80 +/* + * Disable EC console input if the system is locked. This is needed for + * security on platforms where the EC console is accessible from outside the + * case - for example, via a special USB dongle. + */ #undef CONFIG_CONSOLE_RESTRICTED_INPUT /*****************************************************************************/ @@ -196,7 +221,12 @@ #undef CONFIG_EXTPOWER_GPIO #undef CONFIG_EXTPOWER_USB -#undef CONFIG_FLASH +/*****************************************************************************/ +/* Flash configuration */ + +/* Compile support for programming on-chip flash */ +#define CONFIG_FLASH + #undef CONFIG_FLASH_BANK_SIZE #undef CONFIG_FLASH_BASE #undef CONFIG_FLASH_ERASED_VALUE32 @@ -207,8 +237,14 @@ #undef CONFIG_FLASH_WRITE_IDEAL_SIZE #undef CONFIG_FLASH_WRITE_SIZE -#undef CONFIG_FMAP +/*****************************************************************************/ + +/* Include a flashmap in the compiled firmware image */ +#define CONFIG_FMAP + #undef CONFIG_FORCE_CONSOLE_RESUME + +/* Enable support for floating point unit */ #undef CONFIG_FPU #undef CONFIG_FW_IMAGE_SIZE @@ -222,7 +258,6 @@ #undef CONFIG_FW_WP_RO_SIZE #undef CONFIG_HOST_COMMAND_STATUS -#undef CONFIG_HOST_EMU #undef CONFIG_I2C #undef CONFIG_I2C_ARBITRATION @@ -406,9 +441,6 @@ #undef CONFIG_USB_PORT_POWER_SMART #undef CONFIG_USB_SWITCH_TSU6721 -#undef CONFIG_USE_CPCIDVI -#undef CONFIG_USE_PLL - /*****************************************************************************/ /* Watchdog config */ |