scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-11 18:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up chip/board configs for LM4

Browse Source 
Board-specific features like lightbar should be config'd at the board
level, not at the chip level.

BUG=none
TEST=build link, bds, daisy

Change-Id: If1df2ca0422f7b8bdc172d0df7bd9f6a1af6a9d2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Randall Spangler
2012-03-16 13:56:59 -07:00
parent a9f4794edb
commit e68844824b
12 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/bds/board.h
View File

@@ -9,7 +9,7 @@
#define __BOARD_H
/* Config flags */
#define CONFIG_TMP006
#define CONFIG_LIGHTBAR
/* 66.667 Mhz clock frequency */
#define CPU_CLOCK 66666667

2
board/bds/build.mk
View File

@@ -10,4 +10,4 @@ CHIP:=lm4
board-y=board.o
board-$(CONFIG_CHARGER)+=dummy_charger.o
board-$(CONFIG_TEMP_SENSOR)+=board_temp_sensor.o
board-$(CONFIG_TASK_TEMPSENSOR)+=board_temp_sensor.o

3
board/bds/ec.tasklist
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -15,7 +15,6 @@
*/
#define CONFIG_TASK_LIST \
TASK(WATCHDOG, watchdog_task, NULL) \
TASK(TEMPSENSOR, temp_sensor_task, NULL) \
TASK(PWM, pwm_task, NULL) \
TASK(KEYSCAN, keyboard_scan_task, NULL) \
TASK(POWERBTN, power_button_task, NULL) \

4
board/link/board.c
View File

@@ -4,15 +4,15 @@
*/
/* EC for Link board configuration */
#include "adc.h"
#include "board.h"
#include "config.h"
#include "gpio.h"
#include "lm4_adc.h"
#include "power_button.h"
#include "registers.h"
#include "util.h"
#include "x86_power.h"
#include "lm4_adc.h"
#include "adc.h"
#ifndef CONFIG_TASK_X86POWER
#define x86_power_interrupt NULL

2
board/link/board.h
View File

@@ -9,6 +9,8 @@
#define __BOARD_H
/* Optional features */
#define CONFIG_CHARGER
#define CONFIG_LIGHTBAR
#define CONFIG_ONEWIRE
#define CONFIG_PECI
#define CONFIG_POWER_LED

2
board/link/build.mk
View File

@@ -9,4 +9,4 @@
CHIP:=lm4
board-y=board.o
board-$(CONFIG_TEMP_SENSOR)+=board_temp_sensor.o
board-$(CONFIG_TASK_TEMPSENSOR)+=board_temp_sensor.o

1
chip/lm4/adc.c
View File

@@ -7,6 +7,7 @@
#include "adc.h"
#include "console.h"
#include "gpio.h"
#include "lm4_adc.h"
#include "registers.h"
#include "timer.h"

2
chip/lm4/build.mk
View File

@@ -16,6 +16,6 @@ chip-$(CONFIG_LPC)+=lpc.o
chip-$(CONFIG_ONEWIRE)+=onewire.o
chip-$(CONFIG_PECI)+=peci.o
chip-$(CONFIG_PWM)+=pwm.o
chip-$(CONFIG_TEMP_SENSOR)+=chip_temp_sensor.o
chip-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o
chip-$(CONFIG_TASK_POWERBTN)+=power_button.o
chip-$(CONFIG_TASK_TEMPSENSOR)+=chip_temp_sensor.o

5
chip/lm4/config.h
View File

@@ -41,13 +41,10 @@
/* build with assertions and debug messages */
#define CONFIG_DEBUG
/* Optional features */
/* Optional features present on this chip */
#define CONFIG_FLASH
#define CONFIG_LPC
#define CONFIG_PWM
#define CONFIG_TEMP_SENSOR
#define CONFIG_CHARGER
#define CONFIG_LIGHTBAR
#define CONFIG_FPU
/* Compile for running from RAM instead of flash */

18
common/build.mk
View File

@@ -8,22 +8,22 @@
common-y=main.o util.o console.o vboot.o uart_buffering.o usb_charge_commands.o
common-y+=memory_commands.o shared_mem.o system.o usb_charge.o
common-y+=gpio_commands.o version.o
common-$(CONFIG_LPC)+=port80.o host_event_commands.o
common-$(CONFIG_TASK_HOSTCMD)+=host_command.o
common-$(CONFIG_TASK_I8042CMD)+=i8042.o keyboard.o
common-$(CONFIG_TASK_X86POWER)+=x86_power.o
common-$(CONFIG_TASK_GAIAPOWER)+=gaia_power.o
common-$(CONFIG_FLASH)+=flash_commands.o
common-$(CONFIG_LIGHTBAR)+=leds.o
common-$(CONFIG_LPC)+=port80.o host_event_commands.o
common-$(CONFIG_POWER_LED)+=power_led.o
common-$(CONFIG_PSTORE)+=pstore_commands.o
common-$(CONFIG_PWM)+=pwm_commands.o
common-$(CONFIG_TASK_GAIAPOWER)+=gaia_power.o
common-$(CONFIG_TASK_HOSTCMD)+=host_command.o
common-$(CONFIG_TASK_I8042CMD)+=i8042.o keyboard.o
common-$(CONFIG_TASK_TEMPSENSOR)+=temp_sensor.o temp_sensor_commands.o
common-$(CONFIG_TASK_THERMAL)+=thermal.o thermal_commands.o
common-$(CONFIG_TEMP_SENSOR)+=temp_sensor.o temp_sensor_commands.o
common-$(CONFIG_TASK_X86POWER)+=x86_power.o
common-$(CONFIG_TMP006)+=tmp006.o
common-$(CONFIG_LIGHTBAR)+=leds.o
common-$(CONFIG_POWER_LED)+=power_led.o
# Board driver modules
common-$(CONFIG_CHARGER_BQ24725)+=charger_bq24725.o
common-$(CONFIG_BATTERY_ATL706486)+=battery_atl706486.o
common-$(CONFIG_CHARGER_BQ24725)+=charger_bq24725.o
common-$(CONFIG_SMART_BATTERY)+=smart_battery.o charge_state.o \
battery_commands.o

2
common/main.c
View File

@@ -85,7 +85,7 @@ int main(void)
pwm_init();
#endif
i2c_init();
#ifdef CONFIG_TEMP_SENSOR
#ifdef CONFIG_TASK_TEMPSENSOR
temp_sensor_init();
chip_temp_sensor_init();
#endif

3
include/adc.h
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
@@ -10,7 +10,6 @@
#include "common.h"
#include "board.h"
#include "gpio.h"
/* forward declaration */
enum adc_channel;